don't put runtime values in array initializer for C89 compliance (closes #20588)

This commit is contained in:
Benjamin Peterson 2014-02-10 22:19:02 -05:00
parent f0560d9592
commit c2f665e721
3 changed files with 14 additions and 4 deletions

View File

@ -10,6 +10,8 @@ What's New in Python 3.3.5 release candidate 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #20588: Make Python-ast.c C89 compliant.
- Issue #20437: Fixed 21 potential bugs when deleting objects references. - Issue #20437: Fixed 21 potential bugs when deleting objects references.
- Issue #20538: UTF-7 incremental decoder produced inconsistant string when - Issue #20538: UTF-7 incremental decoder produced inconsistant string when

View File

@ -1150,10 +1150,14 @@ PyObject* PyAST_mod2obj(mod_ty t)
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{ {
mod_ty res; mod_ty res;
PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type, PyObject *req_type[3];
(PyObject*)Interactive_type};
char *req_name[] = {"Module", "Expression", "Interactive"}; char *req_name[] = {"Module", "Expression", "Interactive"};
int isinstance; int isinstance;
req_type[0] = (PyObject*)Module_type;
req_type[1] = (PyObject*)Expression_type;
req_type[2] = (PyObject*)Interactive_type;
assert(0 <= mode && mode <= 2); assert(0 <= mode && mode <= 2);
init_types(); init_types();

View File

@ -6957,10 +6957,14 @@ PyObject* PyAST_mod2obj(mod_ty t)
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{ {
mod_ty res; mod_ty res;
PyObject *req_type[] = {(PyObject*)Module_type, (PyObject*)Expression_type, PyObject *req_type[3];
(PyObject*)Interactive_type};
char *req_name[] = {"Module", "Expression", "Interactive"}; char *req_name[] = {"Module", "Expression", "Interactive"};
int isinstance; int isinstance;
req_type[0] = (PyObject*)Module_type;
req_type[1] = (PyObject*)Expression_type;
req_type[2] = (PyObject*)Interactive_type;
assert(0 <= mode && mode <= 2); assert(0 <= mode && mode <= 2);
init_types(); init_types();