diff options
| -rw-r--r-- | Include/asdl.h | 4 | ||||
| -rw-r--r-- | Python/Python-ast.c | 8 | ||||
| -rw-r--r-- | Python/ast.c | 4 | ||||
| -rw-r--r-- | Python/compile.c | 14 |
4 files changed, 11 insertions, 19 deletions
diff --git a/Include/asdl.h b/Include/asdl.h index 84e837e..9bb0697 100644 --- a/Include/asdl.h +++ b/Include/asdl.h @@ -5,10 +5,6 @@ typedef PyObject * identifier; typedef PyObject * string; typedef PyObject * object; -#ifndef __cplusplus -typedef enum {false, true} bool; -#endif - /* It would be nice if the code generated by asdl_c.py was completely independent of Python, but it is a goal the requires too much work at this stage. So, for example, I'll represent identifiers as diff --git a/Python/Python-ast.c b/Python/Python-ast.c index b562182..5aefbac 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -2,7 +2,7 @@ /* - __version__ 53873. + __version__ 53956. This module must be committed separately after each AST grammar change; The __version__ number is set to the revision number of the commit @@ -443,10 +443,6 @@ static PyObject* ast2obj_object(void *o) } #define ast2obj_identifier ast2obj_object #define ast2obj_string ast2obj_object -static PyObject* ast2obj_bool(bool b) -{ - return PyBool_FromLong(b); -} static PyObject* ast2obj_int(long b) { @@ -3013,7 +3009,7 @@ init_ast(void) if (PyDict_SetItemString(d, "AST", (PyObject*)AST_type) < 0) return; if (PyModule_AddIntConstant(m, "PyCF_ONLY_AST", PyCF_ONLY_AST) < 0) return; - if (PyModule_AddStringConstant(m, "__version__", "53873") < 0) + if (PyModule_AddStringConstant(m, "__version__", "53956") < 0) return; if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return; if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0) diff --git a/Python/ast.c b/Python/ast.c index 9d5caf8..92b02f0 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -1660,7 +1660,7 @@ ast_for_trailer(struct compiling *c, const node *n, expr_ty left_expr) int j; slice_ty slc; expr_ty e; - bool simple = true; + int simple = 1; asdl_seq *slices, *elts; slices = asdl_seq_new((NCH(n) + 1) / 2, c->c_arena); if (!slices) @@ -1670,7 +1670,7 @@ ast_for_trailer(struct compiling *c, const node *n, expr_ty left_expr) if (!slc) return NULL; if (slc->kind != Index_kind) - simple = false; + simple = 0; asdl_seq_SET(slices, j / 2, slc); } if (!simple) { diff --git a/Python/compile.c b/Python/compile.c index 9655765..ed0bdcf 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -119,7 +119,7 @@ struct compiler_unit { int u_firstlineno; /* the first lineno of the block */ int u_lineno; /* the lineno for the current stmt */ - bool u_lineno_set; /* boolean to indicate whether instr + int u_lineno_set; /* boolean to indicate whether instr has been generated with current lineno */ }; @@ -464,7 +464,7 @@ compiler_enter_scope(struct compiler *c, identifier name, void *key, u->u_nfblocks = 0; u->u_firstlineno = lineno; u->u_lineno = 0; - u->u_lineno_set = false; + u->u_lineno_set = 0; u->u_consts = PyDict_New(); if (!u->u_consts) { compiler_unit_free(u); @@ -643,7 +643,7 @@ compiler_set_lineno(struct compiler *c, int off) basicblock *b; if (c->u->u_lineno_set) return; - c->u->u_lineno_set = true; + c->u->u_lineno_set = 1; b = c->u->u_curblock; b->b_instr[off].i_lineno = c->u->u_lineno; } @@ -1675,7 +1675,7 @@ compiler_for(struct compiler *c, stmt_ty s) /* XXX(nnorwitz): is there a better way to handle this? for loops are special, we want to be able to trace them each time around, so we need to set an extra line number. */ - c->u->u_lineno_set = false; + c->u->u_lineno_set = 0; ADDOP_JREL(c, FOR_ITER, cleanup); VISIT(c, expr, s->v.For.target); VISIT_SEQ(c, stmt, s->v.For.body); @@ -1898,7 +1898,7 @@ compiler_try_except(struct compiler *c, stmt_ty s) s->v.TryExcept.handlers, i); if (!handler->type && i < n-1) return compiler_error(c, "default 'except:' must be last"); - c->u->u_lineno_set = false; + c->u->u_lineno_set = 0; c->u->u_lineno = handler->lineno; except = compiler_new_block(c); if (except == NULL) @@ -2161,7 +2161,7 @@ compiler_visit_stmt(struct compiler *c, stmt_ty s) /* Always assign a lineno to the next instruction for a stmt. */ c->u->u_lineno = s->lineno; - c->u->u_lineno_set = false; + c->u->u_lineno_set = 0; switch (s->kind) { case FunctionDef_kind: @@ -3015,7 +3015,7 @@ compiler_visit_expr(struct compiler *c, expr_ty e) */ if (e->lineno > c->u->u_lineno) { c->u->u_lineno = e->lineno; - c->u->u_lineno_set = false; + c->u->u_lineno_set = 0; } switch (e->kind) { case BoolOp_kind: |