Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5677] branches/astwrite
|
From: <fwi...@us...> - 2008-12-02 13:55:58
|
Revision: 5677
http://jython.svn.sourceforge.net/jython/?rev=5677&view=rev
Author: fwierzbicki
Date: 2008-12-02 13:55:51 +0000 (Tue, 02 Dec 2008)
Log Message:
-----------
Generating a bunch of PyObject stubs for the enums in ast. Exposing needed
elements to Python.
Modified Paths:
--------------
branches/astwrite/CoreExposed.includes
branches/astwrite/ast/asdl_antlr.py
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/Ellipsis.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/Expression.java
branches/astwrite/src/org/python/antlr/ast/ExtSlice.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/Index.java
branches/astwrite/src/org/python/antlr/ast/Interactive.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/Module.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/Slice.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/Suite.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/antlr/ast/aliasType.java
branches/astwrite/src/org/python/antlr/ast/argumentsType.java
branches/astwrite/src/org/python/antlr/ast/boolopType.java
branches/astwrite/src/org/python/antlr/ast/cmpopType.java
branches/astwrite/src/org/python/antlr/ast/comprehensionType.java
branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java
branches/astwrite/src/org/python/antlr/ast/exprType.java
branches/astwrite/src/org/python/antlr/ast/expr_contextType.java
branches/astwrite/src/org/python/antlr/ast/keywordType.java
branches/astwrite/src/org/python/antlr/ast/modType.java
branches/astwrite/src/org/python/antlr/ast/operatorType.java
branches/astwrite/src/org/python/antlr/ast/sliceType.java
branches/astwrite/src/org/python/antlr/ast/stmtType.java
branches/astwrite/src/org/python/antlr/ast/unaryopType.java
Added Paths:
-----------
branches/astwrite/src/org/python/antlr/ast/Add.java
branches/astwrite/src/org/python/antlr/ast/And.java
branches/astwrite/src/org/python/antlr/ast/AugLoad.java
branches/astwrite/src/org/python/antlr/ast/AugStore.java
branches/astwrite/src/org/python/antlr/ast/BitAnd.java
branches/astwrite/src/org/python/antlr/ast/BitOr.java
branches/astwrite/src/org/python/antlr/ast/BitXor.java
branches/astwrite/src/org/python/antlr/ast/Del.java
branches/astwrite/src/org/python/antlr/ast/Div.java
branches/astwrite/src/org/python/antlr/ast/Eq.java
branches/astwrite/src/org/python/antlr/ast/Gt.java
branches/astwrite/src/org/python/antlr/ast/GtE.java
branches/astwrite/src/org/python/antlr/ast/In.java
branches/astwrite/src/org/python/antlr/ast/Invert.java
branches/astwrite/src/org/python/antlr/ast/Is.java
branches/astwrite/src/org/python/antlr/ast/IsNot.java
branches/astwrite/src/org/python/antlr/ast/LShift.java
branches/astwrite/src/org/python/antlr/ast/Load.java
branches/astwrite/src/org/python/antlr/ast/Lt.java
branches/astwrite/src/org/python/antlr/ast/LtE.java
branches/astwrite/src/org/python/antlr/ast/Mod.java
branches/astwrite/src/org/python/antlr/ast/Mult.java
branches/astwrite/src/org/python/antlr/ast/Not.java
branches/astwrite/src/org/python/antlr/ast/NotEq.java
branches/astwrite/src/org/python/antlr/ast/Pow.java
branches/astwrite/src/org/python/antlr/ast/RShift.java
branches/astwrite/src/org/python/antlr/ast/Store.java
branches/astwrite/src/org/python/antlr/ast/Sub.java
branches/astwrite/src/org/python/antlr/ast/UAdd.java
Modified: branches/astwrite/CoreExposed.includes
===================================================================
--- branches/astwrite/CoreExposed.includes 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/CoreExposed.includes 2008-12-02 13:55:51 UTC (rev 5677)
@@ -1,5 +1,3 @@
-org/python/antlr/AST.class
-org/python/antlr/ast/AsmModule.class
org/python/core/PyArray.class
org/python/core/PyBaseString.class
org/python/core/PyBaseException.class
@@ -57,3 +55,51 @@
org/python/modules/zipimport/zipimporter.class
org/python/modules/PyStruct.class
org/python/modules/PyTeeIterator.class
+org/python/antlr/AST.class
+org/python/antlr/ast/AsmModule.class
+org/python/antlr/ast/And.class
+org/python/antlr/ast/BitXor.class
+org/python/antlr/ast/Gt.class
+org/python/antlr/ast/AugLoad.class
+org/python/antlr/ast/Mult.class
+org/python/antlr/ast/NotEq.class
+org/python/antlr/ast/LShift.class
+org/python/antlr/ast/IsNot.class
+org/python/antlr/ast/RShift.class
+org/python/antlr/ast/Eq.class
+org/python/antlr/ast/BitOr.class
+org/python/antlr/ast/Div.class
+org/python/antlr/ast/LtE.class
+org/python/antlr/ast/Store.class
+org/python/antlr/ast/Not.class
+org/python/antlr/ast/BitAnd.class
+org/python/antlr/ast/In.class
+org/python/antlr/ast/UAdd.class
+org/python/antlr/ast/GtE.class
+org/python/antlr/ast/Lt.class
+org/python/antlr/ast/Mod.class
+org/python/antlr/ast/Sub.class
+org/python/antlr/ast/Del.class
+org/python/antlr/ast/Pow.class
+org/python/antlr/ast/Invert.class
+org/python/antlr/ast/Is.class
+org/python/antlr/ast/Load.class
+org/python/antlr/ast/Add.class
+org/python/antlr/ast/AugStore.class
+org/python/antlr/ast/Delete.class
+org/python/antlr/ast/GeneratorExp.class
+org/python/antlr/ast/Import.class
+org/python/antlr/ast/comprehensionType.class
+org/python/antlr/ast/With.class
+org/python/antlr/ast/Module.class
+org/python/antlr/ast/Global.class
+org/python/antlr/ast/Dict.class
+org/python/antlr/ast/ClassDef.class
+org/python/antlr/ast/ExceptHandler.class
+org/python/antlr/ast/TryExcept.class
+org/python/antlr/ast/Tuple.class
+org/python/antlr/ast/ListComp.class
+org/python/antlr/ast/TryFinally.class
+org/python/antlr/ast/If.class
+org/python/antlr/ast/ImportFrom.class
+
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/ast/asdl_antlr.py 2008-12-02 13:55:51 UTC (rev 5677)
@@ -146,6 +146,7 @@
def visitSum(self, sum, name, depth):
if sum.simple and not name == "excepthandler":
self.simple_sum(sum, name, depth)
+ self.simple_sum_wrappers(sum, name, depth)
else:
self.sum_with_constructor(sum, name, depth)
@@ -160,13 +161,39 @@
self.emit("%s," % type.name, depth + 1)
self.emit("%s;" % sum.types[len(sum.types) - 1].name, depth + 1)
- self.attributes(sum, depth, True);
+ #XXX
+ #self.attributes(sum, depth, True);
self.emit("public %sType __call__() { return this; }" % name, depth + 1)
self.emit("}", depth)
self.close()
+ def simple_sum_wrappers(self, sum, name, depth):
+ for i in range(len(sum.types) - 1):
+ type = sum.types[i]
+ self.open("%s" % type.name, refersToPythonTree=0)
+ self.emit('import org.python.antlr.AST;', depth)
+ self.emit('import org.python.core.PyObject;', depth)
+ self.emit('import org.python.core.PyType;', depth)
+ self.emit('import org.python.expose.ExposedType;', depth)
+ self.emit('', 0)
+ self.emit('@ExposedType(name = "_ast.%s", base = PyObject.class)' % type.name, depth)
+ self.emit("public class %s extends AST {" % type.name, depth)
+ self.emit('public static final PyType TYPE = PyType.fromClass(%s.class);' % type.name, depth + 1)
+
+ self.emit('public int asIndex() {', depth + 1)
+ self.emit('return asIndex(null);', depth + 2)
+ self.emit("}", depth + 1)
+
+ self.emit('public int asIndex(PyObject error) {', depth + 1)
+ self.emit('return %s;' % str(i), depth + 2)
+ self.emit("}", depth + 1)
+
+ self.emit("}", depth)
+ self.close()
+
+
def attributes(self, obj, depth, always_emit=False):
field_list = []
if hasattr(obj, "fields"):
@@ -175,10 +202,12 @@
if len(field_list) > 0:
self.emit("private final static String[] fields = new String[] {%s};" %
", ".join(field_list), depth+1)
+ self.emit('@ExposedGet(name = "_fields")', depth)
self.emit("public String[] get_fields() { return fields; }", depth+1)
self.emit("", 0)
elif always_emit:
self.emit("private final static String[] fields = new String[0];", depth+1)
+ self.emit('@ExposedGet(name = "_fields")', depth)
self.emit("public String[] get_fields() { return fields; }", depth+1)
self.emit("", 0)
@@ -189,16 +218,19 @@
if len(att_list) > 0:
self.emit("private final static String[] attributes = new String[] {%s};" %
", ".join(att_list), depth+1)
+ self.emit('@ExposedGet(name = "_attributes")', depth)
self.emit("public String[] get_attributes() { return attributes; }", depth+1)
self.emit("", 0)
elif always_emit:
self.emit("private final static String[] attributes = new String[0];", depth+1)
+ self.emit('@ExposedGet(name = "_attributes")', depth)
self.emit("public String[] get_attributes() { return attributes; }", depth+1)
self.emit("", 0)
def sum_with_constructor(self, sum, name, depth):
self.open("%sType" % name)
+ self.emit('@ExposedType(name = "_ast.%s", base = PyObject.class)' % name, depth)
self.emit("public abstract class %(name)sType extends PythonTree {" %
locals(), depth)
self.emit("", 0)
@@ -237,6 +269,7 @@
def visitProduct(self, product, name, depth):
self.open("%sType" % name, useDataOutput=1)
+ self.emit('@ExposedType(name = "_ast.%s", base = PyObject.class)' % name, depth)
self.emit("public class %(name)sType extends PythonTree {" % locals(), depth)
self.emit("public static final PyType TYPE = PyType.fromClass(%sType.class);" % name, depth + 1);
for f in product.fields:
@@ -282,6 +315,7 @@
if str(name) in ('stmt', 'expr', 'excepthandler'):
# The lineno property
self.emit("private int lineno = -1;", depth + 1)
+ self.emit('@ExposedGet(name = "lineno")', depth)
self.emit("public int getLineno() {", depth + 1)
self.emit("if (lineno != -1) {", depth + 2);
self.emit("return lineno;", depth + 3);
@@ -289,6 +323,7 @@
self.emit('return getLine();', depth + 2)
self.emit("}", depth + 1)
self.emit("", 0)
+ self.emit('@ExposedSet(name = "lineno")', depth)
self.emit("public void setLineno(int num) {", depth + 1)
self.emit("lineno = num;", depth + 2);
self.emit("}", depth + 1)
@@ -296,6 +331,7 @@
# The col_offset property
self.emit("private int col_offset = -1;", depth + 1)
+ self.emit('@ExposedGet(name = "col_offset")', depth)
self.emit("public int getCol_offset() {", depth + 1)
self.emit("if (col_offset != -1) {", depth + 2);
self.emit("return col_offset;", depth + 3);
@@ -303,6 +339,7 @@
self.emit('return getCharPositionInLine();', depth + 2)
self.emit("}", depth + 1)
self.emit("", 0)
+ self.emit('@ExposedSet(name = "col_offset")', depth)
self.emit("public void setCol_offset(int num) {", depth + 1)
self.emit("col_offset = num;", depth + 2);
self.emit("}", depth + 1)
@@ -344,6 +381,7 @@
self.javaConstructors(type, clsname, ctorname, fields, depth)
# The toString() method
+ self.emit('@ExposedGet(name = "repr")', depth)
self.emit("public String toString() {", depth)
self.emit('return "%s";' % clsname, depth+1)
self.emit("}", depth)
@@ -475,7 +513,7 @@
field.name), depth)
if field.seq:
#self.emit("this.%s = new %s(" % (field.name, self.javaType(field)), depth+1)
- self.emit("//FJW this.%s = AstAdapters.to_%sList(%s);" % (field.name, str(field.type), field.name), depth+1)
+ self.emit("this.%s = AstAdapters.to_%sList(%s);" % (field.name, str(field.type), field.name), depth+1)
else:
self.emit("this.%s = AstAdapters.to_%s(%s);" % (field.name, str(field.type), field.name), depth+1)
self.emit("}", depth)
Added: branches/astwrite/src/org/python/antlr/ast/Add.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Add.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/Add.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.Add", base = PyObject.class)
+public class Add extends AST {
+ public static final PyType TYPE = PyType.fromClass(Add.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 0;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/ast/And.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/And.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/And.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.And", base = PyObject.class)
+public class And extends AST {
+ public static final PyType TYPE = PyType.fromClass(And.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 0;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -49,6 +49,7 @@
private final static String[] fields = new String[] {"test", "msg"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Assert() {
@@ -89,6 +90,7 @@
addChild(msg);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Assert";
}
@@ -117,6 +119,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -124,11 +127,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -136,6 +141,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "targets")
public void setTargets(PyObject targets) {
- //FJW this.targets = AstAdapters.to_exprList(targets);
+ this.targets = AstAdapters.to_exprList(targets);
}
private exprType value;
@@ -49,6 +49,7 @@
private final static String[] fields = new String[] {"targets", "value"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Assign() {
@@ -107,6 +108,7 @@
addChild(value);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Assign";
}
@@ -139,6 +141,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -146,11 +149,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -158,6 +163,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -64,6 +64,7 @@
private final static String[] fields = new String[] {"value", "attr",
"ctx"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Attribute() {
@@ -108,6 +109,7 @@
this.ctx = ctx;
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Attribute";
}
@@ -141,6 +143,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -148,11 +151,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -160,6 +165,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -63,6 +63,7 @@
private final static String[] fields = new String[] {"target", "op",
"value"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public AugAssign() {
@@ -110,6 +111,7 @@
addChild(value);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "AugAssign";
}
@@ -141,6 +143,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -148,11 +151,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -160,6 +165,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Added: branches/astwrite/src/org/python/antlr/ast/AugLoad.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugLoad.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/AugLoad.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.AugLoad", base = PyObject.class)
+public class AugLoad extends AST {
+ public static final PyType TYPE = PyType.fromClass(AugLoad.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 3;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/ast/AugStore.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugStore.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/AugStore.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.AugStore", base = PyObject.class)
+public class AugStore extends AST {
+ public static final PyType TYPE = PyType.fromClass(AugStore.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 4;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -62,6 +62,7 @@
private final static String[] fields = new String[] {"left", "op", "right"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public BinOp() {
@@ -108,6 +109,7 @@
addChild(right);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "BinOp";
}
@@ -139,6 +141,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -146,11 +149,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -158,6 +163,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Added: branches/astwrite/src/org/python/antlr/ast/BitAnd.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitAnd.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/BitAnd.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.BitAnd", base = PyObject.class)
+public class BitAnd extends AST {
+ public static final PyType TYPE = PyType.fromClass(BitAnd.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 10;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/ast/BitOr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitOr.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/BitOr.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.BitOr", base = PyObject.class)
+public class BitOr extends AST {
+ public static final PyType TYPE = PyType.fromClass(BitOr.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 8;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/ast/BitXor.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitXor.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/BitXor.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.BitXor", base = PyObject.class)
+public class BitXor extends AST {
+ public static final PyType TYPE = PyType.fromClass(BitXor.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 9;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -44,11 +44,12 @@
}
@ExposedSet(name = "values")
public void setValues(PyObject values) {
- //FJW this.values = AstAdapters.to_exprList(values);
+ this.values = AstAdapters.to_exprList(values);
}
private final static String[] fields = new String[] {"op", "values"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public BoolOp() {
@@ -103,6 +104,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "BoolOp";
}
@@ -133,6 +135,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -140,11 +143,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -152,6 +157,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Break.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Break.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Break.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -34,6 +34,7 @@
super(tree);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Break";
}
@@ -52,6 +53,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -59,11 +61,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -71,6 +75,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "args")
public void setArgs(PyObject args) {
- //FJW this.args = AstAdapters.to_exprList(args);
+ this.args = AstAdapters.to_exprList(args);
}
private java.util.List<keywordType> keywords;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "keywords")
public void setKeywords(PyObject keywords) {
- //FJW this.keywords = AstAdapters.to_keywordList(keywords);
+ this.keywords = AstAdapters.to_keywordList(keywords);
}
private exprType starargs;
@@ -90,6 +90,7 @@
private final static String[] fields = new String[] {"func", "args",
"keywords",
"starargs", "kwargs"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Call() {
@@ -186,6 +187,7 @@
addChild(kwargs);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Call";
}
@@ -237,6 +239,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -244,11 +247,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -256,6 +261,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -45,7 +45,7 @@
}
@ExposedSet(name = "bases")
public void setBases(PyObject bases) {
- //FJW this.bases = AstAdapters.to_exprList(bases);
+ this.bases = AstAdapters.to_exprList(bases);
}
private java.util.List<stmtType> body;
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- //FJW this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<exprType> decorator_list;
@@ -71,13 +71,14 @@
}
@ExposedSet(name = "decorator_list")
public void setDecorator_list(PyObject decorator_list) {
- //FJW this.decorator_list = AstAdapters.to_exprList(decorator_list);
+ this.decorator_list = AstAdapters.to_exprList(decorator_list);
}
private final static String[] fields = new String[] {"name", "bases",
"body",
"decorator_list"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public ClassDef() {
@@ -180,6 +181,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "ClassDef";
}
@@ -228,6 +230,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -235,11 +238,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -247,6 +252,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "ops")
public void setOps(PyObject ops) {
- //FJW this.ops = AstAdapters.to_cmpopList(ops);
+ this.ops = AstAdapters.to_cmpopList(ops);
}
private java.util.List<exprType> comparators;
@@ -57,12 +57,13 @@
}
@ExposedSet(name = "comparators")
public void setComparators(PyObject comparators) {
- //FJW this.comparators = AstAdapters.to_exprList(comparators);
+ this.comparators = AstAdapters.to_exprList(comparators);
}
private final static String[] fields = new String[] {"left", "ops",
"comparators"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Compare() {
@@ -125,6 +126,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Compare";
}
@@ -160,6 +162,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -167,11 +170,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -179,6 +184,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Continue.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -34,6 +34,7 @@
super(tree);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Continue";
}
@@ -52,6 +53,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -59,11 +61,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -71,6 +75,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Added: branches/astwrite/src/org/python/antlr/ast/Del.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Del.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/Del.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.Del", base = PyObject.class)
+public class Del extends AST {
+ public static final PyType TYPE = PyType.fromClass(Del.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 2;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -31,11 +31,12 @@
}
@ExposedSet(name = "targets")
public void setTargets(PyObject targets) {
- //FJW this.targets = AstAdapters.to_exprList(targets);
+ this.targets = AstAdapters.to_exprList(targets);
}
private final static String[] fields = new String[] {"targets"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Delete() {
@@ -85,6 +86,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Delete";
}
@@ -112,6 +114,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -119,11 +122,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -131,6 +136,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "keys")
public void setKeys(PyObject keys) {
- //FJW this.keys = AstAdapters.to_exprList(keys);
+ this.keys = AstAdapters.to_exprList(keys);
}
private java.util.List<exprType> values;
@@ -44,11 +44,12 @@
}
@ExposedSet(name = "values")
public void setValues(PyObject values) {
- //FJW this.values = AstAdapters.to_exprList(values);
+ this.values = AstAdapters.to_exprList(values);
}
private final static String[] fields = new String[] {"keys", "values"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Dict() {
@@ -122,6 +123,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Dict";
}
@@ -158,6 +160,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -165,11 +168,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -177,6 +182,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Added: branches/astwrite/src/org/python/antlr/ast/Div.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Div.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/Div.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.Div", base = PyObject.class)
+public class Div extends AST {
+ public static final PyType TYPE = PyType.fromClass(Div.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 3;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Ellipsis.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Ellipsis.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -34,6 +34,7 @@
super(tree);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Ellipsis";
}
Added: branches/astwrite/src/org/python/antlr/ast/Eq.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Eq.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/Eq.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.Eq", base = PyObject.class)
+public class Eq extends AST {
+ public static final PyType TYPE = PyType.fromClass(Eq.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 0;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -57,12 +57,13 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- //FJW this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private final static String[] fields = new String[] {"excepttype", "name",
"body"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public ExceptHandler() {
@@ -128,6 +129,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "ExceptHandler";
}
@@ -165,6 +167,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -172,11 +175,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -184,6 +189,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -63,6 +63,7 @@
private final static String[] fields = new String[] {"body", "globals",
"locals"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Exec() {
@@ -112,6 +113,7 @@
addChild(locals);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Exec";
}
@@ -145,6 +147,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -152,11 +155,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -164,6 +169,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -36,6 +36,7 @@
private final static String[] fields = new String[] {"value"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Expr() {
@@ -69,6 +70,7 @@
addChild(value);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Expr";
}
@@ -92,6 +94,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -99,11 +102,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -111,6 +116,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -36,6 +36,7 @@
private final static String[] fields = new String[] {"body"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Expression() {
@@ -69,6 +70,7 @@
addChild(body);
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Expression";
}
Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -31,11 +31,12 @@
}
@ExposedSet(name = "dims")
public void setDims(PyObject dims) {
- //FJW this.dims = AstAdapters.to_sliceList(dims);
+ this.dims = AstAdapters.to_sliceList(dims);
}
private final static String[] fields = new String[] {"dims"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public ExtSlice() {
@@ -85,6 +86,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "ExtSlice";
}
Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- //FJW this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -70,12 +70,13 @@
}
@ExposedSet(name = "orelse")
public void setOrelse(PyObject orelse) {
- //FJW this.orelse = AstAdapters.to_stmtList(orelse);
+ this.orelse = AstAdapters.to_stmtList(orelse);
}
private final static String[] fields = new String[] {"target", "iter",
"body", "orelse"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public For() {
@@ -163,6 +164,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "For";
}
@@ -209,6 +211,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -216,11 +219,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -228,6 +233,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- //FJW this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<exprType> decorator_list;
@@ -71,13 +71,14 @@
}
@ExposedSet(name = "decorator_list")
public void setDecorator_list(PyObject decorator_list) {
- //FJW this.decorator_list = AstAdapters.to_exprList(decorator_list);
+ this.decorator_list = AstAdapters.to_exprList(decorator_list);
}
private final static String[] fields = new String[] {"name", "args",
"body",
"decorator_list"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public FunctionDef() {
@@ -161,6 +162,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "FunctionDef";
}
@@ -205,6 +207,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -212,11 +215,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -224,6 +229,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -44,11 +44,12 @@
}
@ExposedSet(name = "generators")
public void setGenerators(PyObject generators) {
- //FJW this.generators = AstAdapters.to_comprehensionList(generators);
+ this.generators = AstAdapters.to_comprehensionList(generators);
}
private final static String[] fields = new String[] {"elt", "generators"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public GeneratorExp() {
@@ -107,6 +108,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "GeneratorExp";
}
@@ -139,6 +141,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -146,11 +149,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -158,6 +163,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -31,11 +31,12 @@
}
@ExposedSet(name = "names")
public void setNames(PyObject names) {
- //FJW this.names = AstAdapters.to_identifierList(names);
+ this.names = AstAdapters.to_identifierList(names);
}
private final static String[] fields = new String[] {"names"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public Global() {
@@ -66,6 +67,7 @@
this.names = names;
}
+ @ExposedGet(name = "repr")
public String toString() {
return "Global";
}
@@ -87,6 +89,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -94,11 +97,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
public void setLineno(int num) {
lineno = num;
}
private int col_offset = -1;
+@ExposedGet(name = "col_offset")
public int getCol_offset() {
if (col_offset != -1) {
return col_offset;
@@ -106,6 +111,7 @@
return getCharPositionInLine();
}
+@ExposedSet(name = "col_offset")
public void setCol_offset(int num) {
col_offset = num;
}
Added: branches/astwrite/src/org/python/antlr/ast/Gt.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Gt.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/Gt.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.Gt", base = PyObject.class)
+public class Gt extends AST {
+ public static final PyType TYPE = PyType.fromClass(Gt.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 4;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/ast/GtE.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GtE.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/ast/GtE.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -0,0 +1,18 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+
+import org.python.antlr.AST;
+import org.python.core.PyObject;
+import org.python.core.PyType;
+import org.python.expose.ExposedType;
+
+@ExposedType(name = "_ast.GtE", base = PyObject.class)
+public class GtE extends AST {
+ public static final PyType TYPE = PyType.fromClass(GtE.class);
+ public int asIndex() {
+ return asIndex(null);
+ }
+ public int asIndex(PyObject error) {
+ return 5;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-02 10:54:26 UTC (rev 5676)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-02 13:55:51 UTC (rev 5677)
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- //FJW this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -57,12 +57,13 @@
}
@ExposedSet(name = "orelse")
public void setOrelse(PyObject orelse) {
- //FJW this.orelse = AstAdapters.to_stmtList(orelse);
+ this.orelse = AstAdapters.to_stmtList(orelse);
}
private final static String[] fields = new String[] {"test", "body",
"orelse"};
+@ExposedGet(name = "_fields")
public String[] get_fields() { return fields; }
public If() {
@@ -143,6 +144,7 @@
}
}
+ @ExposedGet(name = "repr")
public String toString() {
return "If";
}
@@ -184,6 +186,7 @@
}
private int lineno = -1;
+@ExposedGet(name = "lineno")
public int getLineno() {
if (lineno != -1) {
return lineno;
@@ -191,11 +194,13 @@
return getLine();
}
+@ExposedSet(name = "lineno")
...
[truncated message content] |
