Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5678] branches/astwrite
|
From: <fwi...@us...> - 2008-12-02 22:23:37
|
Revision: 5678
http://jython.svn.sourceforge.net/jython/?rev=5678&view=rev
Author: fwierzbicki
Date: 2008-12-02 22:23:33 +0000 (Tue, 02 Dec 2008)
Log Message:
-----------
Much better support for PyObjects to represent the ast enums.
Modified Paths:
--------------
branches/astwrite/CoreExposed.includes
branches/astwrite/ast/asdl_antlr.py
branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
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/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/AugLoad.java
branches/astwrite/src/org/python/antlr/ast/AugStore.java
branches/astwrite/src/org/python/antlr/ast/BinOp.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/BoolOp.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/Del.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/Div.java
branches/astwrite/src/org/python/antlr/ast/Eq.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/Gt.java
branches/astwrite/src/org/python/antlr/ast/GtE.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/In.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/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/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/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/Module.java
branches/astwrite/src/org/python/antlr/ast/Mult.java
branches/astwrite/src/org/python/antlr/ast/Name.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/Num.java
branches/astwrite/src/org/python/antlr/ast/Pow.java
branches/astwrite/src/org/python/antlr/ast/Print.java
branches/astwrite/src/org/python/antlr/ast/RShift.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/Store.java
branches/astwrite/src/org/python/antlr/ast/Str.java
branches/astwrite/src/org/python/antlr/ast/Sub.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/UAdd.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/comprehensionType.java
branches/astwrite/src/org/python/antlr/ast/keywordType.java
Modified: branches/astwrite/CoreExposed.includes
===================================================================
--- branches/astwrite/CoreExposed.includes 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/CoreExposed.includes 2008-12-02 22:23:33 UTC (rev 5678)
@@ -102,4 +102,17 @@
org/python/antlr/ast/TryFinally.class
org/python/antlr/ast/If.class
org/python/antlr/ast/ImportFrom.class
+org/python/antlr/ast/FunctionDef.class
+org/python/antlr/ast/argumentsType.class
+org/python/antlr/ast/List.class
+org/python/antlr/ast/Interactive.class
+org/python/antlr/ast/ExtSlice.class
+org/python/antlr/ast/Compare.class
+org/python/antlr/ast/While.class
+org/python/antlr/ast/Call.class
+org/python/antlr/ast/Assign.class
+org/python/antlr/ast/For.class
+org/python/antlr/ast/Suite.class
+org/python/antlr/ast/BoolOp.class
+org/python/antlr/ast/Print.class
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/ast/asdl_antlr.py 2008-12-02 22:23:33 UTC (rev 5678)
@@ -170,7 +170,7 @@
self.close()
def simple_sum_wrappers(self, sum, name, depth):
- for i in range(len(sum.types) - 1):
+ for i in range(len(sum.types)):
type = sum.types[i]
self.open("%s" % type.name, refersToPythonTree=0)
self.emit('import org.python.antlr.AST;', depth)
@@ -187,7 +187,7 @@
self.emit("}", depth + 1)
self.emit('public int asIndex(PyObject error) {', depth + 1)
- self.emit('return %s;' % str(i), depth + 2)
+ self.emit('return %s;' % str(i + 1), depth + 2)
self.emit("}", depth + 1)
self.emit("}", depth)
@@ -503,7 +503,7 @@
elif str(field.type) == 'int':
self.emit("return Py.newInteger(%s);" % field.name, depth+1)
elif field.typedef.simple:
- self.emit("return Py.None;//(%s);" % field.name, depth+1)
+ self.emit("return AstAdapters.%s2py(%s);" % (field.name, field.name), depth+1)
else:
self.emit("return %s;" % field.name, depth+1)
#self.emit("return Py.None;", depth+1)
@@ -513,9 +513,9 @@
field.name), depth)
if field.seq:
#self.emit("this.%s = new %s(" % (field.name, self.javaType(field)), depth+1)
- self.emit("this.%s = AstAdapters.to_%sList(%s);" % (field.name, str(field.type), field.name), depth+1)
+ self.emit("this.%s = AstAdapters.py2%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("this.%s = AstAdapters.py2%s(%s);" % (field.name, str(field.type), field.name), depth+1)
self.emit("}", depth)
self.emit("", 0)
Modified: branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -18,47 +18,47 @@
public static SliceAdapter sliceAdapter = new SliceAdapter();
public static StmtAdapter stmtAdapter = new StmtAdapter();
- public static java.util.List<aliasType> to_aliasList(PyObject o) {
+ public static java.util.List<aliasType> py2aliasList(PyObject o) {
return (java.util.List<aliasType>)aliasAdapter.iter2ast(o);
}
- public static java.util.List<cmpopType> to_cmpopList(PyObject o) {
+ public static java.util.List<cmpopType> py2cmpopList(PyObject o) {
return (java.util.List<cmpopType>)cmpopAdapter.iter2ast(o);
}
- public static java.util.List<comprehensionType> to_comprehensionList(PyObject o) {
+ public static java.util.List<comprehensionType> py2comprehensionList(PyObject o) {
return (java.util.List<comprehensionType>)comprehensionAdapter.iter2ast(o);
}
- public static java.util.List<excepthandlerType> to_excepthandlerList(PyObject o) {
+ public static java.util.List<excepthandlerType> py2excepthandlerList(PyObject o) {
return (java.util.List<excepthandlerType>)excepthandlerAdapter.iter2ast(o);
}
- public static java.util.List<exprType> to_exprList(PyObject o) {
+ public static java.util.List<exprType> py2exprList(PyObject o) {
return (java.util.List<exprType>)exprAdapter.iter2ast(o);
}
- public static java.util.List<String> to_identifierList(PyObject o) {
+ public static java.util.List<String> py2identifierList(PyObject o) {
return (java.util.List<String>)identifierAdapter.iter2ast(o);
}
- public static java.util.List<keywordType> to_keywordList(PyObject o) {
+ public static java.util.List<keywordType> py2keywordList(PyObject o) {
return (java.util.List<keywordType>)keywordAdapter.iter2ast(o);
}
- public static java.util.List<sliceType> to_sliceList(PyObject o) {
+ public static java.util.List<sliceType> py2sliceList(PyObject o) {
return (java.util.List<sliceType>)sliceAdapter.iter2ast(o);
}
- public static java.util.List<stmtType> to_stmtList(PyObject o) {
+ public static java.util.List<stmtType> py2stmtList(PyObject o) {
return (java.util.List<stmtType>)stmtAdapter.iter2ast(o);
}
- public static exprType to_expr(PyObject o) {
+ public static exprType py2expr(PyObject o) {
return (exprType)exprAdapter.py2ast(o);
}
- public static int to_int(Object o) {
+ public static int py2int(Object o) {
if (o == null || o instanceof Integer) {
return (Integer)o;
}
@@ -66,11 +66,11 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to int node");
}
- public static String to_identifier(PyObject o) {
+ public static String py2identifier(PyObject o) {
return (String)identifierAdapter.py2ast(o);
}
- public static expr_contextType to_expr_context(Object o) {
+ public static expr_contextType py2expr_context(Object o) {
if (o == null || o instanceof expr_contextType) {
return (expr_contextType)o;
}
@@ -78,15 +78,15 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr_context node");
}
- public static sliceType to_slice(PyObject o) {
+ public static sliceType py2slice(PyObject o) {
return (sliceType)sliceAdapter.py2ast(o);
}
- public static stmtType to_stmt(PyObject o) {
+ public static stmtType py2stmt(PyObject o) {
return (stmtType)stmtAdapter.py2ast(o);
}
- public static String to_string(Object o) {
+ public static String py2string(Object o) {
if (o == null || o instanceof String) {
return (String)o;
}
@@ -94,7 +94,7 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to string node");
}
- public static operatorType to_operator(Object o) {
+ public static operatorType py2operator(Object o) {
if (o == null || o instanceof operatorType) {
return (operatorType)o;
}
@@ -102,7 +102,80 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to operator node");
}
- public static boolopType to_boolop(Object o) {
+ public static PyObject op2py(operatorType o) {
+ switch (o) {
+ case Add:
+ return new Add();
+ case Sub:
+ return new Sub();
+ case Mult:
+ return new Mult();
+ case Div:
+ return new Div();
+ case Mod:
+ return new Mod();
+ case Pow:
+ return new Pow();
+ case LShift:
+ return new LShift();
+ case RShift:
+ return new RShift();
+ case BitOr:
+ return new BitOr();
+ case BitXor:
+ return new BitXor();
+ case BitAnd:
+ return new BitAnd();
+ case FloorDiv:
+ return new FloorDiv();
+ }
+ return Py.None;
+ }
+
+ public static PyObject op2py(boolopType o) {
+ switch (o) {
+ case And:
+ return new And();
+ case Or:
+ return new Or();
+ }
+ return Py.None;
+ }
+
+ public static PyObject op2py(unaryopType o) {
+ switch (o) {
+ case Invert:
+ return new Invert();
+ case Not:
+ return new Not();
+ case UAdd:
+ return new UAdd();
+ case USub:
+ return new USub();
+ }
+ return Py.None;
+ }
+
+
+ public static PyObject ctx2py(expr_contextType o) {
+ switch (o) {
+ case Load:
+ return new Load();
+ case Store:
+ return new Store();
+ case Del:
+ return new Del();
+ case AugLoad:
+ return new AugLoad();
+ case AugStore:
+ return new AugStore();
+ case Param:
+ return new Param();
+ }
+ return Py.None;
+ }
+
+ public static boolopType py2boolop(Object o) {
if (o == null || o instanceof boolopType) {
return (boolopType)o;
}
@@ -110,7 +183,7 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to boolop node");
}
- public static argumentsType to_arguments(Object o) {
+ public static argumentsType py2arguments(Object o) {
if (o == null || o instanceof argumentsType) {
return (argumentsType)o;
}
@@ -119,11 +192,11 @@
}
//XXX: clearly this isn't necessary -- need to adjust the code generation.
- public static Object to_object(Object o) {
+ public static Object py2object(Object o) {
return o;
}
- public static Boolean to_bool(Object o) {
+ public static Boolean py2bool(Object o) {
if (o == null || o instanceof Boolean) {
return (Boolean)o;
}
@@ -131,7 +204,7 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to Boolean node");
}
- public static unaryopType to_unaryop(Object o) {
+ public static unaryopType py2unaryop(Object o) {
if (o == null || o instanceof unaryopType) {
return (unaryopType)o;
}
Modified: branches/astwrite/src/org/python/antlr/ast/Add.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Add.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Add.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 0;
+ return 1;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/And.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/And.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/And.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 0;
+ return 1;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "test")
public void setTest(PyObject test) {
- this.test = AstAdapters.to_expr(test);
+ this.test = AstAdapters.py2expr(test);
}
private exprType msg;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "msg")
public void setMsg(PyObject msg) {
- this.msg = AstAdapters.to_expr(msg);
+ this.msg = AstAdapters.py2expr(msg);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "targets")
public void setTargets(PyObject targets) {
- this.targets = AstAdapters.to_exprList(targets);
+ this.targets = AstAdapters.py2exprList(targets);
}
private exprType value;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
private String attr;
@@ -45,7 +45,7 @@
}
@ExposedSet(name = "attr")
public void setAttr(PyObject attr) {
- this.attr = AstAdapters.to_identifier(attr);
+ this.attr = AstAdapters.py2identifier(attr);
}
private expr_contextType ctx;
@@ -54,11 +54,11 @@
}
@ExposedGet(name = "ctx")
public PyObject getCtx() {
- return Py.None;//(ctx);
+ return AstAdapters.ctx2py(ctx);
}
@ExposedSet(name = "ctx")
public void setCtx(PyObject ctx) {
- this.ctx = AstAdapters.to_expr_context(ctx);
+ this.ctx = AstAdapters.py2expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "target")
public void setTarget(PyObject target) {
- this.target = AstAdapters.to_expr(target);
+ this.target = AstAdapters.py2expr(target);
}
private operatorType op;
@@ -40,11 +40,11 @@
}
@ExposedGet(name = "op")
public PyObject getOp() {
- return Py.None;//(op);
+ return AstAdapters.op2py(op);
}
@ExposedSet(name = "op")
public void setOp(PyObject op) {
- this.op = AstAdapters.to_operator(op);
+ this.op = AstAdapters.py2operator(op);
}
private exprType value;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/AugLoad.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugLoad.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/AugLoad.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 3;
+ return 4;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/AugStore.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugStore.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/AugStore.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 4;
+ return 5;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "left")
public void setLeft(PyObject left) {
- this.left = AstAdapters.to_expr(left);
+ this.left = AstAdapters.py2expr(left);
}
private operatorType op;
@@ -40,11 +40,11 @@
}
@ExposedGet(name = "op")
public PyObject getOp() {
- return Py.None;//(op);
+ return AstAdapters.op2py(op);
}
@ExposedSet(name = "op")
public void setOp(PyObject op) {
- this.op = AstAdapters.to_operator(op);
+ this.op = AstAdapters.py2operator(op);
}
private exprType right;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "right")
public void setRight(PyObject right) {
- this.right = AstAdapters.to_expr(right);
+ this.right = AstAdapters.py2expr(right);
}
Modified: branches/astwrite/src/org/python/antlr/ast/BitAnd.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitAnd.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/BitAnd.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 10;
+ return 11;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/BitOr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitOr.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/BitOr.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 8;
+ return 9;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/BitXor.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BitXor.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/BitXor.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 9;
+ return 10;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -27,11 +27,11 @@
}
@ExposedGet(name = "op")
public PyObject getOp() {
- return Py.None;//(op);
+ return AstAdapters.op2py(op);
}
@ExposedSet(name = "op")
public void setOp(PyObject op) {
- this.op = AstAdapters.to_boolop(op);
+ this.op = AstAdapters.py2boolop(op);
}
private java.util.List<exprType> values;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "values")
public void setValues(PyObject values) {
- this.values = AstAdapters.to_exprList(values);
+ this.values = AstAdapters.py2exprList(values);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "func")
public void setFunc(PyObject func) {
- this.func = AstAdapters.to_expr(func);
+ this.func = AstAdapters.py2expr(func);
}
private java.util.List<exprType> args;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "args")
public void setArgs(PyObject args) {
- this.args = AstAdapters.to_exprList(args);
+ this.args = AstAdapters.py2exprList(args);
}
private java.util.List<keywordType> keywords;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "keywords")
public void setKeywords(PyObject keywords) {
- this.keywords = AstAdapters.to_keywordList(keywords);
+ this.keywords = AstAdapters.py2keywordList(keywords);
}
private exprType starargs;
@@ -70,7 +70,7 @@
}
@ExposedSet(name = "starargs")
public void setStarargs(PyObject starargs) {
- this.starargs = AstAdapters.to_expr(starargs);
+ this.starargs = AstAdapters.py2expr(starargs);
}
private exprType kwargs;
@@ -83,7 +83,7 @@
}
@ExposedSet(name = "kwargs")
public void setKwargs(PyObject kwargs) {
- this.kwargs = AstAdapters.to_expr(kwargs);
+ this.kwargs = AstAdapters.py2expr(kwargs);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -32,7 +32,7 @@
}
@ExposedSet(name = "name")
public void setName(PyObject name) {
- this.name = AstAdapters.to_identifier(name);
+ this.name = AstAdapters.py2identifier(name);
}
private java.util.List<exprType> bases;
@@ -45,7 +45,7 @@
}
@ExposedSet(name = "bases")
public void setBases(PyObject bases) {
- this.bases = AstAdapters.to_exprList(bases);
+ this.bases = AstAdapters.py2exprList(bases);
}
private java.util.List<stmtType> body;
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
private java.util.List<exprType> decorator_list;
@@ -71,7 +71,7 @@
}
@ExposedSet(name = "decorator_list")
public void setDecorator_list(PyObject decorator_list) {
- this.decorator_list = AstAdapters.to_exprList(decorator_list);
+ this.decorator_list = AstAdapters.py2exprList(decorator_list);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "left")
public void setLeft(PyObject left) {
- this.left = AstAdapters.to_expr(left);
+ this.left = AstAdapters.py2expr(left);
}
private java.util.List<cmpopType> ops;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "ops")
public void setOps(PyObject ops) {
- this.ops = AstAdapters.to_cmpopList(ops);
+ this.ops = AstAdapters.py2cmpopList(ops);
}
private java.util.List<exprType> comparators;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "comparators")
public void setComparators(PyObject comparators) {
- this.comparators = AstAdapters.to_exprList(comparators);
+ this.comparators = AstAdapters.py2exprList(comparators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Del.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Del.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Del.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 2;
+ return 3;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "targets")
public void setTargets(PyObject targets) {
- this.targets = AstAdapters.to_exprList(targets);
+ this.targets = AstAdapters.py2exprList(targets);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "keys")
public void setKeys(PyObject keys) {
- this.keys = AstAdapters.to_exprList(keys);
+ this.keys = AstAdapters.py2exprList(keys);
}
private java.util.List<exprType> values;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "values")
public void setValues(PyObject values) {
- this.values = AstAdapters.to_exprList(values);
+ this.values = AstAdapters.py2exprList(values);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Div.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Div.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Div.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 3;
+ return 4;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Eq.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Eq.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Eq.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 0;
+ return 1;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/ExceptHandler.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "excepttype")
public void setExcepttype(PyObject excepttype) {
- this.excepttype = AstAdapters.to_expr(excepttype);
+ this.excepttype = AstAdapters.py2expr(excepttype);
}
private exprType name;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "name")
public void setName(PyObject name) {
- this.name = AstAdapters.to_expr(name);
+ this.name = AstAdapters.py2expr(name);
}
private java.util.List<stmtType> body;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_expr(body);
+ this.body = AstAdapters.py2expr(body);
}
private exprType globals;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "globals")
public void setGlobals(PyObject globals) {
- this.globals = AstAdapters.to_expr(globals);
+ this.globals = AstAdapters.py2expr(globals);
}
private exprType locals;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "locals")
public void setLocals(PyObject locals) {
- this.locals = AstAdapters.to_expr(locals);
+ this.locals = AstAdapters.py2expr(locals);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_expr(body);
+ this.body = AstAdapters.py2expr(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "dims")
public void setDims(PyObject dims) {
- this.dims = AstAdapters.to_sliceList(dims);
+ this.dims = AstAdapters.py2sliceList(dims);
}
Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "target")
public void setTarget(PyObject target) {
- this.target = AstAdapters.to_expr(target);
+ this.target = AstAdapters.py2expr(target);
}
private exprType iter;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "iter")
public void setIter(PyObject iter) {
- this.iter = AstAdapters.to_expr(iter);
+ this.iter = AstAdapters.py2expr(iter);
}
private java.util.List<stmtType> body;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -70,7 +70,7 @@
}
@ExposedSet(name = "orelse")
public void setOrelse(PyObject orelse) {
- this.orelse = AstAdapters.to_stmtList(orelse);
+ this.orelse = AstAdapters.py2stmtList(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -32,7 +32,7 @@
}
@ExposedSet(name = "name")
public void setName(PyObject name) {
- this.name = AstAdapters.to_identifier(name);
+ this.name = AstAdapters.py2identifier(name);
}
private argumentsType args;
@@ -45,7 +45,7 @@
}
@ExposedSet(name = "args")
public void setArgs(PyObject args) {
- this.args = AstAdapters.to_arguments(args);
+ this.args = AstAdapters.py2arguments(args);
}
private java.util.List<stmtType> body;
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
private java.util.List<exprType> decorator_list;
@@ -71,7 +71,7 @@
}
@ExposedSet(name = "decorator_list")
public void setDecorator_list(PyObject decorator_list) {
- this.decorator_list = AstAdapters.to_exprList(decorator_list);
+ this.decorator_list = AstAdapters.py2exprList(decorator_list);
}
Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "elt")
public void setElt(PyObject elt) {
- this.elt = AstAdapters.to_expr(elt);
+ this.elt = AstAdapters.py2expr(elt);
}
private java.util.List<comprehensionType> generators;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "generators")
public void setGenerators(PyObject generators) {
- this.generators = AstAdapters.to_comprehensionList(generators);
+ this.generators = AstAdapters.py2comprehensionList(generators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "names")
public void setNames(PyObject names) {
- this.names = AstAdapters.to_identifierList(names);
+ this.names = AstAdapters.py2identifierList(names);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Gt.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Gt.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Gt.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 4;
+ return 5;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/GtE.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GtE.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/GtE.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 5;
+ return 6;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "test")
public void setTest(PyObject test) {
- this.test = AstAdapters.to_expr(test);
+ this.test = AstAdapters.py2expr(test);
}
private java.util.List<stmtType> body;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "orelse")
public void setOrelse(PyObject orelse) {
- this.orelse = AstAdapters.to_stmtList(orelse);
+ this.orelse = AstAdapters.py2stmtList(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "test")
public void setTest(PyObject test) {
- this.test = AstAdapters.to_expr(test);
+ this.test = AstAdapters.py2expr(test);
}
private exprType body;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_expr(body);
+ this.body = AstAdapters.py2expr(body);
}
private exprType orelse;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "orelse")
public void setOrelse(PyObject orelse) {
- this.orelse = AstAdapters.to_expr(orelse);
+ this.orelse = AstAdapters.py2expr(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "names")
public void setNames(PyObject names) {
- this.names = AstAdapters.to_aliasList(names);
+ this.names = AstAdapters.py2aliasList(names);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -32,7 +32,7 @@
}
@ExposedSet(name = "module")
public void setModule(PyObject module) {
- this.module = AstAdapters.to_identifier(module);
+ this.module = AstAdapters.py2identifier(module);
}
private java.util.List<aliasType> names;
@@ -45,7 +45,7 @@
}
@ExposedSet(name = "names")
public void setNames(PyObject names) {
- this.names = AstAdapters.to_aliasList(names);
+ this.names = AstAdapters.py2aliasList(names);
}
private Integer level;
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "level")
public void setLevel(PyObject level) {
- this.level = AstAdapters.to_int(level);
+ this.level = AstAdapters.py2int(level);
}
Modified: branches/astwrite/src/org/python/antlr/ast/In.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/In.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/In.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 8;
+ return 9;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Index.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Index.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Index.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Invert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Invert.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Invert.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 0;
+ return 1;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Is.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Is.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Is.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 6;
+ return 7;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/IsNot.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/IsNot.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/IsNot.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 7;
+ return 8;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/LShift.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/LShift.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/LShift.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 6;
+ return 7;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "args")
public void setArgs(PyObject args) {
- this.args = AstAdapters.to_arguments(args);
+ this.args = AstAdapters.py2arguments(args);
}
private exprType body;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_expr(body);
+ this.body = AstAdapters.py2expr(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/List.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "elts")
public void setElts(PyObject elts) {
- this.elts = AstAdapters.to_exprList(elts);
+ this.elts = AstAdapters.py2exprList(elts);
}
private expr_contextType ctx;
@@ -40,11 +40,11 @@
}
@ExposedGet(name = "ctx")
public PyObject getCtx() {
- return Py.None;//(ctx);
+ return AstAdapters.ctx2py(ctx);
}
@ExposedSet(name = "ctx")
public void setCtx(PyObject ctx) {
- this.ctx = AstAdapters.to_expr_context(ctx);
+ this.ctx = AstAdapters.py2expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "elt")
public void setElt(PyObject elt) {
- this.elt = AstAdapters.to_expr(elt);
+ this.elt = AstAdapters.py2expr(elt);
}
private java.util.List<comprehensionType> generators;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "generators")
public void setGenerators(PyObject generators) {
- this.generators = AstAdapters.to_comprehensionList(generators);
+ this.generators = AstAdapters.py2comprehensionList(generators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Load.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Load.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Load.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 0;
+ return 1;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Lt.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Lt.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Lt.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 2;
+ return 3;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/LtE.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/LtE.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/LtE.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 3;
+ return 4;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Mod.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Mod.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Mod.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 4;
+ return 5;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Module.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Module.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Module.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "body")
public void setBody(PyObject body) {
- this.body = AstAdapters.to_stmtList(body);
+ this.body = AstAdapters.py2stmtList(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Mult.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Mult.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Mult.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 2;
+ return 3;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Name.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Name.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Name.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -32,7 +32,7 @@
}
@ExposedSet(name = "id")
public void setId(PyObject id) {
- this.id = AstAdapters.to_identifier(id);
+ this.id = AstAdapters.py2identifier(id);
}
private expr_contextType ctx;
@@ -41,11 +41,11 @@
}
@ExposedGet(name = "ctx")
public PyObject getCtx() {
- return Py.None;//(ctx);
+ return AstAdapters.ctx2py(ctx);
}
@ExposedSet(name = "ctx")
public void setCtx(PyObject ctx) {
- this.ctx = AstAdapters.to_expr_context(ctx);
+ this.ctx = AstAdapters.py2expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Not.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Not.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Not.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 1;
+ return 2;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/NotEq.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/NotEq.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/NotEq.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 1;
+ return 2;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Num.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Num.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Num.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "n")
public void setN(PyObject n) {
- this.n = AstAdapters.to_object(n);
+ this.n = AstAdapters.py2object(n);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Pow.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Pow.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Pow.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 5;
+ return 6;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "dest")
public void setDest(PyObject dest) {
- this.dest = AstAdapters.to_expr(dest);
+ this.dest = AstAdapters.py2expr(dest);
}
private java.util.List<exprType> values;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "values")
public void setValues(PyObject values) {
- this.values = AstAdapters.to_exprList(values);
+ this.values = AstAdapters.py2exprList(values);
}
private Boolean nl;
@@ -58,7 +58,7 @@
}
@ExposedSet(name = "nl")
public void setNl(PyObject nl) {
- this.nl = AstAdapters.to_bool(nl);
+ this.nl = AstAdapters.py2bool(nl);
}
Modified: branches/astwrite/src/org/python/antlr/ast/RShift.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/RShift.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/RShift.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -13,6 +13,6 @@
return asIndex(null);
}
public int asIndex(PyObject error) {
- return 7;
+ return 8;
}
}
Modified: branches/astwrite/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "excepttype")
public void setExcepttype(PyObject excepttype) {
- this.excepttype = AstAdapters.to_expr(excepttype);
+ this.excepttype = AstAdapters.py2expr(excepttype);
}
private exprType inst;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "inst")
public void setInst(PyObject inst) {
- this.inst = AstAdapters.to_expr(inst);
+ this.inst = AstAdapters.py2expr(inst);
}
private exprType tback;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "tback")
public void setTback(PyObject tback) {
- this.tback = AstAdapters.to_expr(tback);
+ this.tback = AstAdapters.py2expr(tback);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Return.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Return.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Return.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "value")
public void setValue(PyObject value) {
- this.value = AstAdapters.to_expr(value);
+ this.value = AstAdapters.py2expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Slice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Slice.java 2008-12-02 13:55:51 UTC (rev 5677)
+++ branches/astwrite/src/org/python/antlr/ast/Slice.java 2008-12-02 22:23:33 UTC (rev 5678)
@@ -31,7 +31,7 @@
}
@ExposedSet(name = "lower")
public void setLower(PyObject lower) {
- this.lower = AstAdapters.to_expr(lower);
+ this.lower = AstAdapters.py2expr(lower);
}
private exprType upper;
@@ -44,7 +44,7 @@
}
@ExposedSet(name = "upper")
public void setUpper(PyObject upper) {
- this.upper = AstAdapters.to_expr(upper);
+ this.upper = AstAdapters.py2expr(upper);
}
private exprType step;
@@ -57,7 +57,7 @@
}
@ExposedSet(name = "step")
public void setStep(PyObject step) {
- this.step = AstAdapters.to_expr(step);
+ this.step = AstAdapters.py2expr(step);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Store.java
===================================================================
--- branches/astwrite/src/org/py...
[truncated message content] |
