[Python-checkins] r86541 - in python/branches/release31-maint: Parser/asdl_c.py Python/Python-ast.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Nov 20 03:04:14 2010
New Revision: 86541

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Parser/asdl_c.py
   python/branches/release31-maint/Python/Python-ast.c

Modified: python/branches/release31-maint/Parser/asdl_c.py
==============================================================================
--- python/branches/release31-maint/Parser/asdl_c.py	(original)
+++ python/branches/release31-maint/Parser/asdl_c.py	Sat Nov 20 03:04:14 2010
@@ -366,9 +366,9 @@
         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):

Modified: python/branches/release31-maint/Python/Python-ast.c
==============================================================================
--- python/branches/release31-maint/Python/Python-ast.c	(original)
+++ python/branches/release31-maint/Python/Python-ast.c	Sat Nov 20 03:04:14 2010
@@ -3379,8 +3379,8 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
 {
         PyObject* tmp = NULL;
-        tmp = tmp;
         int isinstance;
+        tmp = tmp;
 
         int lineno;
         int col_offset;