Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5634] branches/astwrite
|
From: <fwi...@us...> - 2008-11-25 03:03:54
|
Revision: 5634
http://jython.svn.sourceforge.net/jython/?rev=5634&view=rev
Author: fwierzbicki
Date: 2008-11-25 03:03:43 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
Another small step towards writable AST. Starting on some Adapter classes.
The names and design need to change, but this is a start.
Modified Paths:
--------------
branches/astwrite/ast/asdl_antlr.py
branches/astwrite/src/org/python/antlr/ListWrapper.java
branches/astwrite/src/org/python/antlr/ast/Assert.java
branches/astwrite/src/org/python/antlr/ast/Assign.java
branches/astwrite/src/org/python/antlr/ast/Attribute.java
branches/astwrite/src/org/python/antlr/ast/AugAssign.java
branches/astwrite/src/org/python/antlr/ast/BinOp.java
branches/astwrite/src/org/python/antlr/ast/BoolOp.java
branches/astwrite/src/org/python/antlr/ast/Break.java
branches/astwrite/src/org/python/antlr/ast/Call.java
branches/astwrite/src/org/python/antlr/ast/ClassDef.java
branches/astwrite/src/org/python/antlr/ast/Compare.java
branches/astwrite/src/org/python/antlr/ast/Continue.java
branches/astwrite/src/org/python/antlr/ast/Delete.java
branches/astwrite/src/org/python/antlr/ast/Dict.java
branches/astwrite/src/org/python/antlr/ast/Ellipsis.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/VisitorBase.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/excepthandlerType.java
branches/astwrite/src/org/python/antlr/ast/exprType.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/sliceType.java
branches/astwrite/src/org/python/antlr/ast/stmtType.java
Added Paths:
-----------
branches/astwrite/src/org/python/antlr/AstAdapters.java
branches/astwrite/src/org/python/antlr/AstObjectAdapter.java
branches/astwrite/src/org/python/antlr/StmtListAdapter.java
Removed Paths:
-------------
branches/astwrite/src/org/python/antlr/AstAdapter.java
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/ast/asdl_antlr.py 2008-11-25 03:03:43 UTC (rev 5634)
@@ -57,7 +57,7 @@
print >> self.file, 'package org.python.antlr.ast;'
if refersToPythonTree:
print >> self.file, 'import java.util.ArrayList;'
- print >> self.file, 'import org.python.antlr.AstAdapter;'
+ print >> self.file, 'import org.python.antlr.AstAdapters;'
print >> self.file, 'import org.python.antlr.PythonTree;'
print >> self.file, 'import org.python.antlr.ListWrapper;'
print >> self.file, 'import org.antlr.runtime.CommonToken;'
@@ -430,9 +430,9 @@
field.name), depth)
if field.seq:
#self.emit("this.%s = new %s(" % (field.name, self.javaType(field)), depth+1)
- self.emit("this.%s = AstAdapter.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 = AstAdapter.to_%s(%s);" % (field.name, str(field.type), field.name), depth+1)
+ self.emit("this.%s = AstAdapters.to_%s(%s);" % (field.name, str(field.type), field.name), depth+1)
self.emit("}", depth)
self.emit("", 0)
Deleted: branches/astwrite/src/org/python/antlr/AstAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/AstAdapter.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/AstAdapter.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,145 +0,0 @@
-package org.python.antlr;
-
-import org.python.antlr.ast.*;
-import org.python.core.*;
-
-/**
- * AstAdapter turns Python and Java objects into ast nodes.
- */
-public class AstAdapter {
-
- public static java.util.List<aliasType> to_aliasList(Object o) {
- return null;
- }
-
- public static java.util.List<cmpopType> to_cmpopList(Object o) {
- return null;
- }
-
- public static java.util.List<comprehensionType> to_comprehensionList(Object o) {
- return null;
- }
-
- public static java.util.List<excepthandlerType> to_excepthandlerList(Object o) {
- return null;
- }
-
- public static java.util.List<exprType> to_exprList(Object o) {
- return null;
- }
-
- public static java.util.List<String> to_identifierList(Object o) {
- return null;
- }
-
- public static java.util.List<keywordType> to_keywordList(Object o) {
- return null;
- }
-
- public static java.util.List<sliceType> to_sliceList(Object o) {
- return null;
- }
-
- public static java.util.List<stmtType> to_stmtList(Object o) {
- return null;
- }
-
- public static exprType to_expr(Object o) {
- if (o == null || o instanceof exprType) {
- return (exprType)o;
- } else if (o instanceof Integer) {
- return new Num(new PyInteger((Integer)o));
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr node");
- }
-
- public static int to_int(Object o) {
- if (o == null || o instanceof Integer) {
- return (Integer)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to int node");
- }
-
- public static String to_identifier(Object o) {
- if (o == null || o instanceof String) {
- return (String)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to identifier node");
- }
-
- public static expr_contextType to_expr_context(Object o) {
- if (o == null || o instanceof expr_contextType) {
- return (expr_contextType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr_context node");
- }
-
- public static sliceType to_slice(Object o) {
- if (o == null || o instanceof sliceType) {
- return (sliceType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to slice node");
- }
-
- public static String to_string(Object o) {
- if (o == null || o instanceof String) {
- return (String)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to string node");
- }
-
- public static operatorType to_operator(Object o) {
- if (o == null || o instanceof operatorType) {
- return (operatorType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to operator node");
- }
-
- public static boolopType to_boolop(Object o) {
- if (o == null || o instanceof boolopType) {
- return (boolopType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to boolop node");
- }
-
- public static argumentsType to_arguments(Object o) {
- if (o == null || o instanceof argumentsType) {
- return (argumentsType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to arguments node");
- }
-
- public static Object to_object(Object o) {
- if (o == null || o instanceof Object) {
- return (Object)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to object node");
- }
-
- public static Boolean to_bool(Object o) {
- if (o == null || o instanceof Boolean) {
- return (Boolean)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to Boolean node");
- }
-
- public static unaryopType to_unaryop(Object o) {
- if (o == null || o instanceof unaryopType) {
- return (unaryopType)o;
- }
- //FIXME: investigate the right exception
- throw Py.TypeError("Can't convert " + o.getClass().getName() + " to unaryop node");
- }
-
-}
Added: branches/astwrite/src/org/python/antlr/AstAdapters.java
===================================================================
--- branches/astwrite/src/org/python/antlr/AstAdapters.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/AstAdapters.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -0,0 +1,156 @@
+package org.python.antlr;
+
+import org.python.antlr.ast.*;
+import org.python.core.*;
+
+/**
+ * AstAdapter turns Python and Java objects into ast nodes.
+ */
+public class AstAdapters {
+
+ public static java.util.List<aliasType> to_aliasList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<cmpopType> to_cmpopList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<comprehensionType> to_comprehensionList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<excepthandlerType> to_excepthandlerList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<exprType> to_exprList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<String> to_identifierList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<keywordType> to_keywordList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<sliceType> to_sliceList(Object o) {
+ return null;
+ }
+
+ public static java.util.List<stmtType> to_stmtList(Object o) {
+ return null;
+ }
+
+ public static exprType to_expr(Object o) {
+ if (o == null || o instanceof exprType) {
+ return (exprType)o;
+ } else if (o instanceof Integer) {
+ return new Num(new PyInteger((Integer)o));
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr node");
+ }
+
+ public static int to_int(Object o) {
+ if (o == null || o instanceof Integer) {
+ return (Integer)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to int node");
+ }
+
+ public static String to_identifier(Object o) {
+ if (o == null || o instanceof String) {
+ return (String)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to identifier node");
+ }
+
+ public static expr_contextType to_expr_context(Object o) {
+ if (o == null || o instanceof expr_contextType) {
+ return (expr_contextType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to expr_context node");
+ }
+
+ public static sliceType to_slice(Object o) {
+ if (o == null || o instanceof sliceType) {
+ return (sliceType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to slice node");
+ }
+
+ public static stmtType to_stmt(Object o) {
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(stmtType.class);
+ }
+ if (o == null || o instanceof stmtType) {
+ return (stmtType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to stmt node");
+ }
+
+ public static String to_string(Object o) {
+ if (o == null || o instanceof String) {
+ return (String)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to string node");
+ }
+
+ public static operatorType to_operator(Object o) {
+ if (o == null || o instanceof operatorType) {
+ return (operatorType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to operator node");
+ }
+
+ public static boolopType to_boolop(Object o) {
+ if (o == null || o instanceof boolopType) {
+ return (boolopType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to boolop node");
+ }
+
+ public static argumentsType to_arguments(Object o) {
+ if (o == null || o instanceof argumentsType) {
+ return (argumentsType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to arguments node");
+ }
+
+ public static Object to_object(Object o) {
+ if (o == null || o instanceof Object) {
+ return (Object)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to object node");
+ }
+
+ public static Boolean to_bool(Object o) {
+ if (o == null || o instanceof Boolean) {
+ return (Boolean)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to Boolean node");
+ }
+
+ public static unaryopType to_unaryop(Object o) {
+ if (o == null || o instanceof unaryopType) {
+ return (unaryopType)o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to unaryop node");
+ }
+
+}
Added: branches/astwrite/src/org/python/antlr/AstObjectAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/AstObjectAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/AstObjectAdapter.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -0,0 +1,5 @@
+package org.python.antlr;
+
+public interface AstObjectAdapter {
+ public Object adapt(Object o);
+}
Modified: branches/astwrite/src/org/python/antlr/ListWrapper.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ListWrapper.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ListWrapper.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -7,14 +7,20 @@
import java.util.ListIterator;
import org.python.core.PyObject;
-public class ListWrapper<E> implements List<E> {
+public class ListWrapper implements List {
- private List<E> list;
+ private List list;
+ private AstObjectAdapter adapter;
- public ListWrapper(List<E> list) {
+ public ListWrapper(List list) {
this.list = list;
}
+ public ListWrapper(List list, AstObjectAdapter adapter) {
+ this.adapter = adapter;
+ this.list = list;
+ }
+
public boolean containsAll(Collection c) {
return containsAll(c);
}
@@ -27,11 +33,11 @@
return list.retainAll(c);
}
- public boolean add(E e) {
+ public boolean add(Object e) {
return list.add(e);
}
- public void add(int index, E e) {
+ public void add(int index, Object e) {
list.add(index, e);
}
@@ -51,7 +57,7 @@
return list.contains(elem);
}
- public E get(int index) {
+ public Object get(int index) {
return list.get(index);
}
@@ -67,7 +73,7 @@
return list.lastIndexOf(elem);
}
- public E remove(int index) {
+ public Object remove(int index) {
return list.remove(index);
}
@@ -75,7 +81,7 @@
return list.remove(o);
}
- public E set(int index, E element) {
+ public Object set(int index, Object element) {
return list.set(index, element);
}
@@ -147,7 +153,7 @@
}
public void append(PyObject o) {
- throw new UnsupportedOperationException("Not supported yet.");
+ list.add(adapter.adapt(o));
}
public int count(PyObject o) {
Added: branches/astwrite/src/org/python/antlr/StmtListAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/StmtListAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/StmtListAdapter.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -0,0 +1,22 @@
+package org.python.antlr;
+
+import org.python.antlr.ast.stmtType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StmtListAdapter implements AstObjectAdapter {
+ public Object adaptList(Object list) {
+ List<stmtType> s = new ArrayList<stmtType>();
+ if (list instanceof List) {
+ for (Object o : (List)list) {
+ s.add(AstAdapters.to_stmt(o));
+ }
+ }
+ return s;
+ }
+
+ public Object adapt(Object o) {
+ return AstAdapters.to_stmt(o);
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Assert.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return test;
}
public void setTest(Object test) {
- this.test = AstAdapter.to_expr(test);
+ this.test = AstAdapters.to_expr(test);
}
private exprType msg;
@@ -29,7 +29,7 @@
return msg;
}
public void setMsg(Object msg) {
- this.msg = AstAdapter.to_expr(msg);
+ this.msg = AstAdapters.to_expr(msg);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(targets);
}
public void setTargets(Object targets) {
- this.targets = AstAdapter.to_exprList(targets);
+ this.targets = AstAdapters.to_exprList(targets);
}
private exprType value;
@@ -29,7 +29,7 @@
return value;
}
public void setValue(Object value) {
- this.value = AstAdapter.to_expr(value);
+ this.value = AstAdapters.to_expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Attribute.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return value;
}
public void setValue(Object value) {
- this.value = AstAdapter.to_expr(value);
+ this.value = AstAdapters.to_expr(value);
}
private String attr;
@@ -29,7 +29,7 @@
return attr;
}
public void setAttr(Object attr) {
- this.attr = AstAdapter.to_identifier(attr);
+ this.attr = AstAdapters.to_identifier(attr);
}
private expr_contextType ctx;
@@ -40,7 +40,7 @@
return ctx;
}
public void setCtx(Object ctx) {
- this.ctx = AstAdapter.to_expr_context(ctx);
+ this.ctx = AstAdapters.to_expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/AugAssign.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return target;
}
public void setTarget(Object target) {
- this.target = AstAdapter.to_expr(target);
+ this.target = AstAdapters.to_expr(target);
}
private operatorType op;
@@ -29,7 +29,7 @@
return op;
}
public void setOp(Object op) {
- this.op = AstAdapter.to_operator(op);
+ this.op = AstAdapters.to_operator(op);
}
private exprType value;
@@ -40,7 +40,7 @@
return value;
}
public void setValue(Object value) {
- this.value = AstAdapter.to_expr(value);
+ this.value = AstAdapters.to_expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/BinOp.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return left;
}
public void setLeft(Object left) {
- this.left = AstAdapter.to_expr(left);
+ this.left = AstAdapters.to_expr(left);
}
private operatorType op;
@@ -29,7 +29,7 @@
return op;
}
public void setOp(Object op) {
- this.op = AstAdapter.to_operator(op);
+ this.op = AstAdapters.to_operator(op);
}
private exprType right;
@@ -40,7 +40,7 @@
return right;
}
public void setRight(Object right) {
- this.right = AstAdapter.to_expr(right);
+ this.right = AstAdapters.to_expr(right);
}
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return op;
}
public void setOp(Object op) {
- this.op = AstAdapter.to_boolop(op);
+ this.op = AstAdapters.to_boolop(op);
}
private java.util.List<exprType> values;
@@ -29,7 +29,7 @@
return new ListWrapper(values);
}
public void setValues(Object values) {
- this.values = AstAdapter.to_exprList(values);
+ this.values = AstAdapters.to_exprList(values);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Break.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Break.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Break.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return func;
}
public void setFunc(Object func) {
- this.func = AstAdapter.to_expr(func);
+ this.func = AstAdapters.to_expr(func);
}
private java.util.List<exprType> args;
@@ -29,7 +29,7 @@
return new ListWrapper(args);
}
public void setArgs(Object args) {
- this.args = AstAdapter.to_exprList(args);
+ this.args = AstAdapters.to_exprList(args);
}
private java.util.List<keywordType> keywords;
@@ -40,7 +40,7 @@
return new ListWrapper(keywords);
}
public void setKeywords(Object keywords) {
- this.keywords = AstAdapter.to_keywordList(keywords);
+ this.keywords = AstAdapters.to_keywordList(keywords);
}
private exprType starargs;
@@ -51,7 +51,7 @@
return starargs;
}
public void setStarargs(Object starargs) {
- this.starargs = AstAdapter.to_expr(starargs);
+ this.starargs = AstAdapters.to_expr(starargs);
}
private exprType kwargs;
@@ -62,7 +62,7 @@
return kwargs;
}
public void setKwargs(Object kwargs) {
- this.kwargs = AstAdapter.to_expr(kwargs);
+ this.kwargs = AstAdapters.to_expr(kwargs);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return name;
}
public void setName(Object name) {
- this.name = AstAdapter.to_identifier(name);
+ this.name = AstAdapters.to_identifier(name);
}
private java.util.List<exprType> bases;
@@ -29,7 +29,7 @@
return new ListWrapper(bases);
}
public void setBases(Object bases) {
- this.bases = AstAdapter.to_exprList(bases);
+ this.bases = AstAdapters.to_exprList(bases);
}
private java.util.List<stmtType> body;
@@ -40,7 +40,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<exprType> decorators;
@@ -51,7 +51,7 @@
return new ListWrapper(decorators);
}
public void setDecorators(Object decorators) {
- this.decorators = AstAdapter.to_exprList(decorators);
+ this.decorators = AstAdapters.to_exprList(decorators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return left;
}
public void setLeft(Object left) {
- this.left = AstAdapter.to_expr(left);
+ this.left = AstAdapters.to_expr(left);
}
private java.util.List<cmpopType> ops;
@@ -29,7 +29,7 @@
return new ListWrapper(ops);
}
public void setOps(Object ops) {
- this.ops = AstAdapter.to_cmpopList(ops);
+ this.ops = AstAdapters.to_cmpopList(ops);
}
private java.util.List<exprType> comparators;
@@ -40,7 +40,7 @@
return new ListWrapper(comparators);
}
public void setComparators(Object comparators) {
- this.comparators = AstAdapter.to_exprList(comparators);
+ this.comparators = AstAdapters.to_exprList(comparators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Continue.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Continue.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(targets);
}
public void setTargets(Object targets) {
- this.targets = AstAdapter.to_exprList(targets);
+ this.targets = AstAdapters.to_exprList(targets);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(keys);
}
public void setKeys(Object keys) {
- this.keys = AstAdapter.to_exprList(keys);
+ this.keys = AstAdapters.to_exprList(keys);
}
private java.util.List<exprType> values;
@@ -29,7 +29,7 @@
return new ListWrapper(values);
}
public void setValues(Object values) {
- this.values = AstAdapter.to_exprList(values);
+ this.values = AstAdapters.to_exprList(values);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Ellipsis.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Ellipsis.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
Modified: branches/astwrite/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Exec.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return body;
}
public void setBody(Object body) {
- this.body = AstAdapter.to_expr(body);
+ this.body = AstAdapters.to_expr(body);
}
private exprType globals;
@@ -29,7 +29,7 @@
return globals;
}
public void setGlobals(Object globals) {
- this.globals = AstAdapter.to_expr(globals);
+ this.globals = AstAdapters.to_expr(globals);
}
private exprType locals;
@@ -40,7 +40,7 @@
return locals;
}
public void setLocals(Object locals) {
- this.locals = AstAdapter.to_expr(locals);
+ this.locals = AstAdapters.to_expr(locals);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Expr.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return value;
}
public void setValue(Object value) {
- this.value = AstAdapter.to_expr(value);
+ this.value = AstAdapters.to_expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Expression.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return body;
}
public void setBody(Object body) {
- this.body = AstAdapter.to_expr(body);
+ this.body = AstAdapters.to_expr(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(dims);
}
public void setDims(Object dims) {
- this.dims = AstAdapter.to_sliceList(dims);
+ this.dims = AstAdapters.to_sliceList(dims);
}
Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return target;
}
public void setTarget(Object target) {
- this.target = AstAdapter.to_expr(target);
+ this.target = AstAdapters.to_expr(target);
}
private exprType iter;
@@ -29,7 +29,7 @@
return iter;
}
public void setIter(Object iter) {
- this.iter = AstAdapter.to_expr(iter);
+ this.iter = AstAdapters.to_expr(iter);
}
private java.util.List<stmtType> body;
@@ -40,7 +40,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -51,7 +51,7 @@
return new ListWrapper(orelse);
}
public void setOrelse(Object orelse) {
- this.orelse = AstAdapter.to_stmtList(orelse);
+ this.orelse = AstAdapters.to_stmtList(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return name;
}
public void setName(Object name) {
- this.name = AstAdapter.to_identifier(name);
+ this.name = AstAdapters.to_identifier(name);
}
private argumentsType args;
@@ -29,7 +29,7 @@
return args;
}
public void setArgs(Object args) {
- this.args = AstAdapter.to_arguments(args);
+ this.args = AstAdapters.to_arguments(args);
}
private java.util.List<stmtType> body;
@@ -40,7 +40,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<exprType> decorators;
@@ -51,7 +51,7 @@
return new ListWrapper(decorators);
}
public void setDecorators(Object decorators) {
- this.decorators = AstAdapter.to_exprList(decorators);
+ this.decorators = AstAdapters.to_exprList(decorators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return elt;
}
public void setElt(Object elt) {
- this.elt = AstAdapter.to_expr(elt);
+ this.elt = AstAdapters.to_expr(elt);
}
private java.util.List<comprehensionType> generators;
@@ -29,7 +29,7 @@
return new ListWrapper(generators);
}
public void setGenerators(Object generators) {
- this.generators = AstAdapter.to_comprehensionList(generators);
+ this.generators = AstAdapters.to_comprehensionList(generators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(names);
}
public void setNames(Object names) {
- this.names = AstAdapter.to_identifierList(names);
+ this.names = AstAdapters.to_identifierList(names);
}
Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return test;
}
public void setTest(Object test) {
- this.test = AstAdapter.to_expr(test);
+ this.test = AstAdapters.to_expr(test);
}
private java.util.List<stmtType> body;
@@ -29,7 +29,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
private java.util.List<stmtType> orelse;
@@ -40,7 +40,7 @@
return new ListWrapper(orelse);
}
public void setOrelse(Object orelse) {
- this.orelse = AstAdapter.to_stmtList(orelse);
+ this.orelse = AstAdapters.to_stmtList(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/IfExp.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return test;
}
public void setTest(Object test) {
- this.test = AstAdapter.to_expr(test);
+ this.test = AstAdapters.to_expr(test);
}
private exprType body;
@@ -29,7 +29,7 @@
return body;
}
public void setBody(Object body) {
- this.body = AstAdapter.to_expr(body);
+ this.body = AstAdapters.to_expr(body);
}
private exprType orelse;
@@ -40,7 +40,7 @@
return orelse;
}
public void setOrelse(Object orelse) {
- this.orelse = AstAdapter.to_expr(orelse);
+ this.orelse = AstAdapters.to_expr(orelse);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(names);
}
public void setNames(Object names) {
- this.names = AstAdapter.to_aliasList(names);
+ this.names = AstAdapters.to_aliasList(names);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return module;
}
public void setModule(Object module) {
- this.module = AstAdapter.to_identifier(module);
+ this.module = AstAdapters.to_identifier(module);
}
private java.util.List<aliasType> names;
@@ -29,7 +29,7 @@
return new ListWrapper(names);
}
public void setNames(Object names) {
- this.names = AstAdapter.to_aliasList(names);
+ this.names = AstAdapters.to_aliasList(names);
}
private Integer level;
@@ -40,7 +40,7 @@
return level;
}
public void setLevel(Object level) {
- this.level = AstAdapter.to_int(level);
+ this.level = AstAdapters.to_int(level);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Index.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Index.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Index.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return value;
}
public void setValue(Object value) {
- this.value = AstAdapter.to_expr(value);
+ this.value = AstAdapters.to_expr(value);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Lambda.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return args;
}
public void setArgs(Object args) {
- this.args = AstAdapter.to_arguments(args);
+ this.args = AstAdapters.to_arguments(args);
}
private exprType body;
@@ -29,7 +29,7 @@
return body;
}
public void setBody(Object body) {
- this.body = AstAdapter.to_expr(body);
+ this.body = AstAdapters.to_expr(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(elts);
}
public void setElts(Object elts) {
- this.elts = AstAdapter.to_exprList(elts);
+ this.elts = AstAdapters.to_exprList(elts);
}
private expr_contextType ctx;
@@ -29,7 +29,7 @@
return ctx;
}
public void setCtx(Object ctx) {
- this.ctx = AstAdapter.to_expr_context(ctx);
+ this.ctx = AstAdapters.to_expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return elt;
}
public void setElt(Object elt) {
- this.elt = AstAdapter.to_expr(elt);
+ this.elt = AstAdapters.to_expr(elt);
}
private java.util.List<comprehensionType> generators;
@@ -29,7 +29,7 @@
return new ListWrapper(generators);
}
public void setGenerators(Object generators) {
- this.generators = AstAdapter.to_comprehensionList(generators);
+ this.generators = AstAdapters.to_comprehensionList(generators);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Module.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Module.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Module.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return new ListWrapper(body);
}
public void setBody(Object body) {
- this.body = AstAdapter.to_stmtList(body);
+ this.body = AstAdapters.to_stmtList(body);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Name.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Name.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Name.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return id;
}
public void setId(Object id) {
- this.id = AstAdapter.to_identifier(id);
+ this.id = AstAdapters.to_identifier(id);
}
private expr_contextType ctx;
@@ -29,7 +29,7 @@
return ctx;
}
public void setCtx(Object ctx) {
- this.ctx = AstAdapter.to_expr_context(ctx);
+ this.ctx = AstAdapters.to_expr_context(ctx);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Num.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Num.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Num.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return n;
}
public void setN(Object n) {
- this.n = AstAdapter.to_object(n);
+ this.n = AstAdapters.to_object(n);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Pass.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Pass.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Pass.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return dest;
}
public void setDest(Object dest) {
- this.dest = AstAdapter.to_expr(dest);
+ this.dest = AstAdapters.to_expr(dest);
}
private java.util.List<exprType> values;
@@ -29,7 +29,7 @@
return new ListWrapper(values);
}
public void setValues(Object values) {
- this.values = AstAdapter.to_exprList(values);
+ this.values = AstAdapters.to_exprList(values);
}
private Boolean nl;
@@ -40,7 +40,7 @@
return nl;
}
public void setNl(Object nl) {
- this.nl = AstAdapter.to_bool(nl);
+ this.nl = AstAdapters.to_bool(nl);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Raise.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonToken;
@@ -18,7 +18,7 @@
return excepttype;
}
public void setExcepttype(Object excepttype) {
- this.excepttype = AstAdapter.to_expr(excepttype);
+ this.excepttype = AstAdapters.to_expr(excepttype);
}
private exprType inst;
@@ -29,7 +29,7 @@
return inst;
}
public void setInst(Object inst) {
- this.inst = AstAdapter.to_expr(inst);
+ this.inst = AstAdapters.to_expr(inst);
}
private exprType tback;
@@ -40,7 +40,7 @@
return tback;
}
public void setTback(Object tback) {
- this.tback = AstAdapter.to_expr(tback);
+ this.tback = AstAdapters.to_expr(tback);
}
Modified: branches/astwrite/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-11-24 19:41:50 UTC (rev 5633)
+++ branches/astwrite/src/org/python/antlr/ast/Repr.java 2008-11-25 03:03:43 UTC (rev 5634)
@@ -1,7 +1,7 @@
// Autogenerated AST node
package org.python.antlr.ast;
import java.util.ArrayList;
-import org.python.antlr.AstAdapter;
+import org.python.antlr.AstAdapters;
import org.python.antlr.PythonTree;
import org.python.antlr.ListWrapper;
import org.antlr.runtime.CommonTok...
[truncated message content] |
