Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5685] branches/astwrite
|
From: <fwi...@us...> - 2008-12-03 19:38:46
|
Revision: 5685
http://jython.svn.sourceforge.net/jython/?rev=5685&view=rev
Author: fwierzbicki
Date: 2008-12-03 19:38:43 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
More of 2.6 test_ast.py now passes.
Modified Paths:
--------------
branches/astwrite/ast/asdl_antlr.py
branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
branches/astwrite/src/org/python/antlr/ast/Assert.java
branches/astwrite/src/org/python/antlr/ast/Assign.java
branches/astwrite/src/org/python/antlr/ast/Attribute.java
branches/astwrite/src/org/python/antlr/ast/AugAssign.java
branches/astwrite/src/org/python/antlr/ast/BinOp.java
branches/astwrite/src/org/python/antlr/ast/BoolOp.java
branches/astwrite/src/org/python/antlr/ast/Break.java
branches/astwrite/src/org/python/antlr/ast/Call.java
branches/astwrite/src/org/python/antlr/ast/ClassDef.java
branches/astwrite/src/org/python/antlr/ast/Compare.java
branches/astwrite/src/org/python/antlr/ast/Continue.java
branches/astwrite/src/org/python/antlr/ast/Delete.java
branches/astwrite/src/org/python/antlr/ast/Dict.java
branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
branches/astwrite/src/org/python/antlr/ast/Exec.java
branches/astwrite/src/org/python/antlr/ast/Expr.java
branches/astwrite/src/org/python/antlr/ast/For.java
branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
branches/astwrite/src/org/python/antlr/ast/Global.java
branches/astwrite/src/org/python/antlr/ast/If.java
branches/astwrite/src/org/python/antlr/ast/IfExp.java
branches/astwrite/src/org/python/antlr/ast/Import.java
branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
branches/astwrite/src/org/python/antlr/ast/Lambda.java
branches/astwrite/src/org/python/antlr/ast/List.java
branches/astwrite/src/org/python/antlr/ast/ListComp.java
branches/astwrite/src/org/python/antlr/ast/Name.java
branches/astwrite/src/org/python/antlr/ast/Num.java
branches/astwrite/src/org/python/antlr/ast/Pass.java
branches/astwrite/src/org/python/antlr/ast/Print.java
branches/astwrite/src/org/python/antlr/ast/Raise.java
branches/astwrite/src/org/python/antlr/ast/Repr.java
branches/astwrite/src/org/python/antlr/ast/Return.java
branches/astwrite/src/org/python/antlr/ast/Str.java
branches/astwrite/src/org/python/antlr/ast/Subscript.java
branches/astwrite/src/org/python/antlr/ast/TryExcept.java
branches/astwrite/src/org/python/antlr/ast/TryFinally.java
branches/astwrite/src/org/python/antlr/ast/Tuple.java
branches/astwrite/src/org/python/antlr/ast/UnaryOp.java
branches/astwrite/src/org/python/antlr/ast/While.java
branches/astwrite/src/org/python/antlr/ast/With.java
branches/astwrite/src/org/python/antlr/ast/Yield.java
branches/astwrite/src/org/python/core/AstList.java
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/ast/asdl_antlr.py 2008-12-03 19:38:43 UTC (rev 5685)
@@ -202,7 +202,7 @@
self.emit("public void %s___init__(PyObject[] args, String[] keywords) {}" % type.name, depth)
self.emit('', 0)
- self.attributes(type, depth);
+ self.attributes(type, name, depth);
self.emit('@ExposedMethod', depth + 1)
self.emit('public PyObject __int__() {', depth + 1)
@@ -219,7 +219,7 @@
self.close()
- def attributes(self, obj, depth):
+ def attributes(self, obj, name, depth):
field_list = []
if hasattr(obj, "fields"):
for f in obj.fields:
@@ -236,11 +236,8 @@
self.emit("public PyString[] get_fields() { return fields; }", depth+1)
self.emit("", 0)
- att_list = []
- if hasattr(obj, "attributes"):
- for a in obj.attributes:
- att_list.append('new PyString("%s")' % a.name)
- if len(att_list) > 0:
+ if str(name) in ('stmt', 'expr', 'excepthandler'):
+ att_list = ['new PyString("lineno")', 'new PyString("col_offset")']
self.emit("private final static PyString[] attributes =", depth + 1)
self.emit("new PyString[] {%s};" % ", ".join(att_list), depth + 1)
self.emit('@ExposedGet(name = "_attributes")', depth + 1)
@@ -261,7 +258,7 @@
self.emit("", 0)
self.emit("public static final PyType TYPE = PyType.fromClass(%sType.class);" % name, depth + 1);
- self.attributes(sum, depth);
+ self.attributes(sum, name, depth);
self.emit("public %(name)sType() {" % locals(), depth+1)
self.emit("}", depth+1)
@@ -301,7 +298,7 @@
self.visit(f, depth + 1)
self.emit("", depth)
- self.attributes(product, depth)
+ self.attributes(product, name, depth)
self.javaMethods(product, name, "%sType" % name, product.fields,
depth+1)
@@ -327,7 +324,7 @@
self.visit(f, depth + 1)
self.emit("", depth)
- self.attributes(cons, depth)
+ self.attributes(cons, name, depth)
self.javaMethods(cons, cons.name, cons.name, cons.fields, depth+1)
Modified: branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -73,6 +73,21 @@
public static expr_contextType py2expr_context(Object o) {
if (o == null || o instanceof expr_contextType) {
return (expr_contextType)o;
+ } else if (o instanceof PyObject) {
+ switch (((PyObject)o).asInt()) {
+ case 1:
+ return expr_contextType.Load;
+ case 2:
+ return expr_contextType.Store;
+ case 3:
+ return expr_contextType.Del;
+ case 4:
+ return expr_contextType.AugLoad;
+ case 5:
+ return expr_contextType.AugStore;
+ case 6:
+ return expr_contextType.Param;
+ }
}
//FIXME: investigate the right exception
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr_context node");
@@ -89,6 +104,8 @@
public static String py2string(Object o) {
if (o == null || o instanceof String) {
return (String)o;
+ } else if (o instanceof PyString) {
+ return ((PyObject)o).toString();
}
//FIXME: investigate the right exception
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to string node");
@@ -103,6 +120,26 @@
return operatorType.Add;
case 2:
return operatorType.Sub;
+ case 3:
+ return operatorType.Mult;
+ case 4:
+ return operatorType.Div;
+ case 5:
+ return operatorType.Mod;
+ case 6:
+ return operatorType.Pow;
+ case 7:
+ return operatorType.LShift;
+ case 8:
+ return operatorType.RShift;
+ case 9:
+ return operatorType.BitOr;
+ case 10:
+ return operatorType.BitXor;
+ case 11:
+ return operatorType.BitAnd;
+ case 12:
+ return operatorType.FloorDiv;
}
}
//FIXME: investigate the right exception
@@ -189,6 +226,13 @@
public static boolopType py2boolop(Object o) {
if (o == null || o instanceof boolopType) {
return (boolopType)o;
+ } else if (o instanceof PyObject) {
+ switch (((PyObject)o).asInt()) {
+ case 1:
+ return boolopType.And;
+ case 2:
+ return boolopType.Or;
+ }
}
//FIXME: investigate the right exception
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to boolop node");
Modified: branches/astwrite/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -68,7 +68,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Break.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Break.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Break.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -27,7 +27,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -94,7 +94,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -82,7 +82,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Continue.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -27,7 +27,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -81,7 +81,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -82,7 +82,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -68,7 +68,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/List.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Name.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Name.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Name.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -55,7 +55,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Num.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Num.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Num.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Pass.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Pass.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Pass.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -27,7 +27,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -68,7 +68,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Return.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Return.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Return.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Str.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Str.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Str.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Subscript.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Subscript.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Subscript.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Tuple.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/UnaryOp.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/UnaryOp.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -54,7 +54,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/While.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/While.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/While.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -67,7 +67,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/With.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/With.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/With.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -68,7 +68,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/antlr/ast/Yield.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Yield.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/antlr/ast/Yield.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -41,7 +41,8 @@
@ExposedGet(name = "_fields")
public PyString[] get_fields() { return fields; }
- private final static PyString[] attributes = new PyString[0];
+ private final static PyString[] attributes =
+ new PyString[] {new PyString("lineno"), new PyString("col_offset")};
@ExposedGet(name = "_attributes")
public PyString[] get_attributes() { return attributes; }
Modified: branches/astwrite/src/org/python/core/AstList.java
===================================================================
--- branches/astwrite/src/org/python/core/AstList.java 2008-12-03 18:28:54 UTC (rev 5684)
+++ branches/astwrite/src/org/python/core/AstList.java 2008-12-03 19:38:43 UTC (rev 5685)
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.ListIterator;
-@ExposedType(name = "_ast.astlist", base = PyObject.class)
+@ExposedType(name = "_ast.astlist", base = PyList.class)
public class AstList extends PySequence implements Cloneable, List {
public static final PyType TYPE = PyType.fromClass(AstList.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
