[Python-checkins] python/dist/src/Python Python-ast.c, 1.1.2.9, 1.1.2.10

[bcannon at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15588/Python

Modified Files:
      Tag: ast-branch
	Python-ast.c 
Log Message:
Fix Python/asdl_c.py so that generated files Include/Python-ast.h and
Python/Python-ast.c do proper casting so that the files now compile.

Also removed warning about ambiguous 'if' and 'else' blocks by putting in curly
braces.

Closes bug #1102710.  Thanks logistix.


Index: Python-ast.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/Attic/Python-ast.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- Python-ast.c	16 Jan 2005 17:09:11 -0000	1.1.2.9
+++ Python-ast.c	20 Mar 2005 23:40:59 -0000	1.1.2.10
@@ -1,4 +1,4 @@
-/* File automatically generated by Parser/asdl_c.py */
+/* File automatically generated by ./Parser/asdl_c.py */
 
 #include "Python.h"
 #include "Python-ast.h"
@@ -324,8 +324,7 @@
 }
 
 stmt_ty
-TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, int
-          lineno)
[...1040 lines suppressed...]
+        }
         marshal_write_int(buf, off, asdl_seq_LEN(o->defaults));
         for (i = 0; i < asdl_seq_LEN(o->defaults); i++) {
                 void *elt = asdl_seq_GET(o->defaults, i);
-                marshal_write_expr(buf, off, elt);
+                marshal_write_expr(buf, off, (expr_ty)elt);
         }
         return 1;
 }
@@ -2226,8 +2241,9 @@
                 marshal_write_int(buf, off, 1);
                 marshal_write_identifier(buf, off, o->asname);
         }
-        else
+        else {
                 marshal_write_int(buf, off, 0);
+        }
         return 1;
 }