[Python-checkins] python/dist/src/Include Python-ast.h, 1.1.2.14, 1.1.2.15

[jhylton@users.sourceforge.net]

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

Modified Files:
      Tag: ast-branch
	Python-ast.h 
Log Message:
Track chance of yield from stmt to expr.

Somehwat crude integration of various (yield_expr|testlist) choices in
ast.  Perhaps add a helper function to hide the test for testlist.
The grammar is sure a mess.



Index: Python-ast.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Attic/Python-ast.h,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- Python-ast.h	15 Oct 2005 19:00:42 -0000	1.1.2.14
+++ Python-ast.h	16 Oct 2005 05:19:43 -0000	1.1.2.15
@@ -1,4 +1,4 @@
-/* File automatically generated by ./Parser/asdl_c.py */
+/* File automatically generated by ../Parser/asdl_c.py */
 
 #include "asdl.h"
 
@@ -59,12 +59,12 @@
 
 struct _stmt {
         enum { FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3,
-               Yield_kind=4, Delete_kind=5, Assign_kind=6, AugAssign_kind=7,
-               Print_kind=8, For_kind=9, While_kind=10, If_kind=11,
-               Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14,
-               Assert_kind=15, Import_kind=16, ImportFrom_kind=17,
-               Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21,
-               Break_kind=22, Continue_kind=23 } kind;
+               Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7,
+               For_kind=8, While_kind=9, If_kind=10, Raise_kind=11,
+               TryExcept_kind=12, TryFinally_kind=13, Assert_kind=14,
+               Import_kind=15, ImportFrom_kind=16, Exec_kind=17,
+               Global_kind=18, Expr_kind=19, Pass_kind=20, Break_kind=21,
+               Continue_kind=22 } kind;
         union {
                 struct {
                         identifier name;
@@ -84,10 +84,6 @@
                 } Return;
                 
                 struct {
-                        expr_ty value;
-                } Yield;
-                
-                struct {
                         asdl_seq *targets;
                 } Delete;
                 
@@ -178,10 +174,10 @@
 
 struct _expr {
         enum { BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4,
-               Dict_kind=5, ListComp_kind=6, GeneratorExp_kind=7,
-               Compare_kind=8, Call_kind=9, Repr_kind=10, Num_kind=11,
-               Str_kind=12, Attribute_kind=13, Subscript_kind=14, Name_kind=15,
-               List_kind=16, Tuple_kind=17 } kind;
+               Dict_kind=5, ListComp_kind=6, GeneratorExp_kind=7, Yield_kind=8,
+               Compare_kind=9, Call_kind=10, Repr_kind=11, Num_kind=12,
+               Str_kind=13, Attribute_kind=14, Subscript_kind=15, Name_kind=16,
+               List_kind=17, Tuple_kind=18 } kind;
         union {
                 struct {
                         boolop_ty op;
@@ -220,6 +216,10 @@
                 } GeneratorExp;
                 
                 struct {
+                        expr_ty value;
+                } Yield;
+                
+                struct {
                         expr_ty left;
                         asdl_seq *ops;
                         asdl_seq *comparators;
@@ -335,7 +335,6 @@
 stmt_ty ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, int
                  lineno);
 stmt_ty Return(expr_ty value, int lineno);
-stmt_ty Yield(expr_ty value, int lineno);
 stmt_ty Delete(asdl_seq * targets, int lineno);
 stmt_ty Assign(asdl_seq * targets, expr_ty value, int lineno);
 stmt_ty AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno);
@@ -364,6 +363,7 @@
 expr_ty Dict(asdl_seq * keys, asdl_seq * values, int lineno);
 expr_ty ListComp(expr_ty elt, asdl_seq * generators, int lineno);
 expr_ty GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno);
+expr_ty Yield(expr_ty value, int lineno);
 expr_ty Compare(expr_ty left, asdl_seq * ops, asdl_seq * comparators, int
                 lineno);
 expr_ty Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty