diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-11-20 02:04:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-11-20 02:04:14 (GMT) |
| commit | e82c169622ed56183cd3837f398a0029d2a403f9 (patch) | |
| tree | 3dd766a5897cf0038fa323a42005e52bd17d0069 | |
| parent | aab9585130d1143f2b734ba67d0676fd874040d8 (diff) | |
| download | cpython-e82c169622ed56183cd3837f398a0029d2a403f9.zip cpython-e82c169622ed56183cd3837f398a0029d2a403f9.tar.gz cpython-e82c169622ed56183cd3837f398a0029d2a403f9.tar.bz2 | |
Merged revisions 86540 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86540 | benjamin.peterson | 2010-11-19 20:01:45 -0600 (Fri, 19 Nov 2010) | 1 line
c89 declarations
........
| -rwxr-xr-x | Parser/asdl_c.py | 2 | ||||
| -rw-r--r-- | Python/Python-ast.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 087f95a..5d896ef 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -366,9 +366,9 @@ class Obj2ModVisitor(PickleVisitor): 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("int isinstance;", 1) self.emit("", 0) def sumTrailer(self, name, add_label=False): diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 47b3e50..1e6ea86 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -3379,8 +3379,8 @@ int obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; if (obj == Py_None) { @@ -3528,8 +3528,8 @@ int obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; int lineno; int col_offset; @@ -4725,8 +4725,8 @@ int obj2ast_expr(PyObject* obj, expr_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; int lineno; int col_offset; @@ -5841,8 +5841,8 @@ int obj2ast_expr_context(PyObject* obj, expr_context_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Load_type); if (isinstance == -1) { @@ -5901,8 +5901,8 @@ int obj2ast_slice(PyObject* obj, slice_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; if (obj == Py_None) { @@ -6024,8 +6024,8 @@ int obj2ast_boolop(PyObject* obj, boolop_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)And_type); if (isinstance == -1) { @@ -6052,8 +6052,8 @@ int obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Add_type); if (isinstance == -1) { @@ -6160,8 +6160,8 @@ int obj2ast_unaryop(PyObject* obj, unaryop_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Invert_type); if (isinstance == -1) { @@ -6204,8 +6204,8 @@ int obj2ast_cmpop(PyObject* obj, cmpop_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; isinstance = PyObject_IsInstance(obj, (PyObject *)Eq_type); if (isinstance == -1) { @@ -6360,8 +6360,8 @@ int obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena) { PyObject* tmp = NULL; - tmp = tmp; int isinstance; + tmp = tmp; int lineno; int col_offset; |