diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-11-20 04:37:00 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-11-20 04:37:00 (GMT) |
commit | 787cddc93dbaeb26fae06947078c1359f1fca376 (patch) | |
tree | 644b75a7a15d19b9274dcb1c69d6a9b6a34620a8 | |
parent | fdd52bea4497138c0e7bbfc3f1df64ff946754eb (diff) | |
download | cpython-787cddc93dbaeb26fae06947078c1359f1fca376.zip cpython-787cddc93dbaeb26fae06947078c1359f1fca376.tar.gz cpython-787cddc93dbaeb26fae06947078c1359f1fca376.tar.bz2 |
Merged revisions 86545 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86545 | benjamin.peterson | 2010-11-19 22:31:07 -0600 (Fri, 19 Nov 2010) | 1 line
new plan: functions that want 'tmp' can declare it
........
-rwxr-xr-x | Parser/asdl_c.py | 4 | ||||
-rw-r--r-- | Python/Python-ast.c | 25 |
2 files changed, 6 insertions, 23 deletions
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 5d896ef..6df11f5 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -365,10 +365,7 @@ class Obj2ModVisitor(PickleVisitor): self.emit("int", 0) self.emit("obj2ast_%s(PyObject* obj, %s* out, PyArena* arena)" % (name, ctype), 0) self.emit("{", 0) - self.emit("PyObject* tmp = NULL;", 1) self.emit("int isinstance;", 1) - # Prevent compiler warnings about unused variable. - self.emit("tmp = tmp;", 1) self.emit("", 0) def sumTrailer(self, name, add_label=False): @@ -403,6 +400,7 @@ class Obj2ModVisitor(PickleVisitor): def complexSum(self, sum, name): self.funcHeader(name) + self.emit("PyObject *tmp = NULL;", 1) for a in sum.attributes: self.visitAttributeDeclaration(a, name, sum=sum) self.emit("", 0) diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 1e6ea86..efc69dc 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -3378,10 +3378,9 @@ failed: int obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; + PyObject *tmp = NULL; if (obj == Py_None) { *out = NULL; @@ -3527,10 +3526,9 @@ obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena) int obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; + PyObject *tmp = NULL; int lineno; int col_offset; @@ -4724,10 +4722,9 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) int obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; + PyObject *tmp = NULL; int lineno; int col_offset; @@ -5840,9 +5837,7 @@ obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) int obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type); if (isinstance == -1) { @@ -5900,10 +5895,9 @@ obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena) int obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; + PyObject *tmp = NULL; if (obj == Py_None) { *out = NULL; @@ -6023,9 +6017,7 @@ obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena) int obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)And_type); if (isinstance == -1) { @@ -6051,9 +6043,7 @@ obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena) int obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type); if (isinstance == -1) { @@ -6159,9 +6149,7 @@ obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena) int obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type); if (isinstance == -1) { @@ -6203,9 +6191,7 @@ obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena) int obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type); if (isinstance == -1) { @@ -6359,10 +6345,9 @@ failed: int obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena) { - PyObject* tmp = NULL; int isinstance; - tmp = tmp; + PyObject *tmp = NULL; int lineno; int col_offset; |