[Python-checkins] python/dist/src/Include Python-ast.h, 1.1.2.12, 1.1.2.13

[jhylton@users.sourceforge.net]

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

Modified Files:
      Tag: ast-branch
	Python-ast.h 
Log Message:
Add line numbers to expressions.

The line numbers aren't used yet, but should make it possible to
generate correct line numbers (e.g. co_lnotab, co_firstlineno).
Several tests fails because of the incorrect line numbers currently
generated.



Index: Python-ast.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Include/Attic/Python-ast.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- Python-ast.h	13 Apr 2005 19:44:37 -0000	1.1.2.12
+++ Python-ast.h	12 Oct 2005 03:18:07 -0000	1.1.2.13
@@ -1,4 +1,4 @@
-/* File automatically generated by ./Parser/asdl_c.py */
+/* File automatically generated by ../Parser/asdl_c.py */
 
 #include "asdl.h"
 
@@ -273,6 +273,7 @@
                 } Tuple;
                 
         } v;
+        int lineno;
 };
 
 struct _slice {
@@ -356,24 +357,27 @@
 stmt_ty Pass(int lineno);
 stmt_ty Break(int lineno);
 stmt_ty Continue(int lineno);
-expr_ty BoolOp(boolop_ty op, asdl_seq * values);
-expr_ty BinOp(expr_ty left, operator_ty op, expr_ty right);
-expr_ty UnaryOp(unaryop_ty op, expr_ty operand);
-expr_ty Lambda(arguments_ty args, expr_ty body);
-expr_ty Dict(asdl_seq * keys, asdl_seq * values);
-expr_ty ListComp(expr_ty elt, asdl_seq * generators);
-expr_ty GeneratorExp(expr_ty elt, asdl_seq * generators);
-expr_ty Compare(expr_ty left, asdl_seq * ops, asdl_seq * comparators);
+expr_ty BoolOp(boolop_ty op, asdl_seq * values, int lineno);
+expr_ty BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno);
+expr_ty UnaryOp(unaryop_ty op, expr_ty operand, int lineno);
+expr_ty Lambda(arguments_ty args, expr_ty body, int lineno);
+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 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
-             starargs, expr_ty kwargs);
-expr_ty Repr(expr_ty value);
-expr_ty Num(object n);
-expr_ty Str(string s);
-expr_ty Attribute(expr_ty value, identifier attr, expr_context_ty ctx);
-expr_ty Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx);
-expr_ty Name(identifier id, expr_context_ty ctx);
-expr_ty List(asdl_seq * elts, expr_context_ty ctx);
-expr_ty Tuple(asdl_seq * elts, expr_context_ty ctx);
+             starargs, expr_ty kwargs, int lineno);
+expr_ty Repr(expr_ty value, int lineno);
+expr_ty Num(object n, int lineno);
+expr_ty Str(string s, int lineno);
+expr_ty Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
+                  lineno);
+expr_ty Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int
+                  lineno);
+expr_ty Name(identifier id, expr_context_ty ctx, int lineno);
+expr_ty List(asdl_seq * elts, expr_context_ty ctx, int lineno);
+expr_ty Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno);
 slice_ty Ellipsis(void);
 slice_ty Slice(expr_ty lower, expr_ty upper, expr_ty step);
 slice_ty ExtSlice(asdl_seq * dims);