Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5641] branches/astwrite
|
From: <fwi...@us...> - 2008-11-26 03:42:11
|
Revision: 5641
http://jython.svn.sourceforge.net/jython/?rev=5641&view=rev
Author: fwierzbicki
Date: 2008-11-26 03:42:02 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
Round out the ast adapters.
Modified Paths:
--------------
branches/astwrite/ast/asdl_antlr.py
branches/astwrite/src/org/python/antlr/PythonTree.java
branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
branches/astwrite/src/org/python/antlr/adapter/ListWrapper.java
branches/astwrite/src/org/python/antlr/ast/Assign.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/Delete.java
branches/astwrite/src/org/python/antlr/ast/Dict.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/Import.java
branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
branches/astwrite/src/org/python/antlr/ast/Interactive.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/Print.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/While.java
branches/astwrite/src/org/python/antlr/ast/With.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
Added Paths:
-----------
branches/astwrite/src/org/python/antlr/adapter/AliasAdapter.java
branches/astwrite/src/org/python/antlr/adapter/AstAdapter.java
branches/astwrite/src/org/python/antlr/adapter/CmpopAdapter.java
branches/astwrite/src/org/python/antlr/adapter/ComprehensionAdapter.java
branches/astwrite/src/org/python/antlr/adapter/ExcepthandlerAdapter.java
branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java
branches/astwrite/src/org/python/antlr/adapter/IdentifierAdapter.java
branches/astwrite/src/org/python/antlr/adapter/KeywordAdapter.java
branches/astwrite/src/org/python/antlr/adapter/SliceAdapter.java
branches/astwrite/src/org/python/antlr/adapter/StmtAdapter.java
Removed Paths:
-------------
branches/astwrite/src/org/python/antlr/adapter/AstObjectAdapter.java
branches/astwrite/src/org/python/antlr/adapter/StmtListAdapter.java
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/ast/asdl_antlr.py 2008-11-26 03:42:02 UTC (rev 5641)
@@ -422,7 +422,7 @@
self.emit("}", depth)
self.emit("public Object get%s() {" % (str(field.name).capitalize()), depth)
if field.seq:
- self.emit("return new ListWrapper(%s);" % field.name, depth+1)
+ self.emit("return new ListWrapper(%s, AstAdapters.%sAdapter);" % (field.name, field.type), depth+1)
else:
self.emit("return %s;" % field.name, depth+1)
self.emit("}", depth)
Modified: branches/astwrite/src/org/python/antlr/PythonTree.java
===================================================================
--- branches/astwrite/src/org/python/antlr/PythonTree.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/PythonTree.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -85,7 +85,7 @@
if ( getChildCount()>0 ) {
return getChild(0).getLine();
}
- return 0;
+ return 1;
}
return token.getLine();
}
Added: branches/astwrite/src/org/python/antlr/adapter/AliasAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AliasAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/AliasAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,34 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.aliasType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AliasAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(aliasType.class);
+ }
+ if (o instanceof aliasType) {
+ return o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to alias node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<aliasType> aliases = new ArrayList<aliasType>();
+ for(Object o : (Iterable)iter) {
+ aliases.add((aliasType)adapt(o));
+ }
+ return aliases;
+ }
+}
Copied: branches/astwrite/src/org/python/antlr/adapter/AstAdapter.java (from rev 5636, branches/astwrite/src/org/python/antlr/adapter/AstObjectAdapter.java)
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/AstAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,13 @@
+package org.python.antlr.adapter;
+
+/**
+ * AstAdapters turn Objects into Ast nodes.
+ */
+public interface AstAdapter {
+
+ /**
+ * @return Ast node version of o.
+ */
+ public abstract Object adapt(Object o);
+
+}
Modified: branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/adapter/AstAdapters.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -3,55 +3,59 @@
import org.python.antlr.ast.*;
import org.python.core.*;
+import java.util.ArrayList;
/**
* AstAdapter turns Python and Java objects into ast nodes.
*/
public class AstAdapters {
+ public static AliasAdapter aliasAdapter = new AliasAdapter();
+ public static CmpopAdapter cmpopAdapter = new CmpopAdapter();
+ public static ComprehensionAdapter comprehensionAdapter = new ComprehensionAdapter();
+ public static ExcepthandlerAdapter excepthandlerAdapter = new ExcepthandlerAdapter();
+ public static ExprAdapter exprAdapter = new ExprAdapter();
+ public static IdentifierAdapter identifierAdapter = new IdentifierAdapter();
+ public static KeywordAdapter keywordAdapter = new KeywordAdapter();
+ public static SliceAdapter sliceAdapter = new SliceAdapter();
+ public static StmtAdapter stmtAdapter = new StmtAdapter();
public static java.util.List<aliasType> to_aliasList(Object o) {
- return null;
+ return (java.util.List<aliasType>)aliasAdapter.adaptIter(o);
}
public static java.util.List<cmpopType> to_cmpopList(Object o) {
- return null;
+ return (java.util.List<cmpopType>)cmpopAdapter.adaptIter(o);
}
public static java.util.List<comprehensionType> to_comprehensionList(Object o) {
- return null;
+ return (java.util.List<comprehensionType>)comprehensionAdapter.adaptIter(o);
}
public static java.util.List<excepthandlerType> to_excepthandlerList(Object o) {
- return null;
+ return (java.util.List<excepthandlerType>)excepthandlerAdapter.adaptIter(o);
}
public static java.util.List<exprType> to_exprList(Object o) {
- return null;
+ return (java.util.List<exprType>)exprAdapter.adaptIter(o);
}
public static java.util.List<String> to_identifierList(Object o) {
- return null;
+ return (java.util.List<String>)identifierAdapter.adaptIter(o);
}
public static java.util.List<keywordType> to_keywordList(Object o) {
- return null;
+ return (java.util.List<keywordType>)keywordAdapter.adaptIter(o);
}
public static java.util.List<sliceType> to_sliceList(Object o) {
- return null;
+ return (java.util.List<sliceType>)sliceAdapter.adaptIter(o);
}
public static java.util.List<stmtType> to_stmtList(Object o) {
- return null;
+ return (java.util.List<stmtType>)stmtAdapter.adaptIter(o);
}
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");
+ return (exprType)exprAdapter.adapt(o);
}
public static int to_int(Object o) {
@@ -63,11 +67,7 @@
}
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");
+ return (String)identifierAdapter.adapt(o);
}
public static expr_contextType to_expr_context(Object o) {
@@ -79,22 +79,11 @@
}
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");
+ return (sliceType)sliceAdapter.adapt(o);
}
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");
+ return (stmtType)stmtAdapter.adapt(o);
}
public static String to_string(Object o) {
@@ -129,12 +118,9 @@
throw Py.TypeError("Can't convert " + o.getClass().getName() + " to arguments node");
}
+ //XXX: clearly this isn't necessary -- need to adjust the code generation.
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");
+ return o;
}
public static Boolean to_bool(Object o) {
Deleted: branches/astwrite/src/org/python/antlr/adapter/AstObjectAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/AstObjectAdapter.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/adapter/AstObjectAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -1,5 +0,0 @@
-package org.python.antlr.adapter;
-
-public interface AstObjectAdapter {
- public Object adapt(Object o);
-}
Added: branches/astwrite/src/org/python/antlr/adapter/CmpopAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/CmpopAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/CmpopAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,34 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.cmpopType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmpopAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(cmpopType.class);
+ }
+ if (o instanceof cmpopType) {
+ return o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to cmpop node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<cmpopType> cmpops = new ArrayList<cmpopType>();
+ for(Object o : (Iterable)iter) {
+ cmpops.add((cmpopType)adapt(o));
+ }
+ return cmpops;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/adapter/ComprehensionAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/ComprehensionAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/ComprehensionAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,34 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.comprehensionType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ComprehensionAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(comprehensionType.class);
+ }
+ if (o instanceof comprehensionType) {
+ return o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to comprehension node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<comprehensionType> comprehensions = new ArrayList<comprehensionType>();
+ for(Object o : (Iterable)iter) {
+ comprehensions.add((comprehensionType)adapt(o));
+ }
+ return comprehensions;
+ }
+}
Added: branches/astwrite/src/org/python/antlr/adapter/ExcepthandlerAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/ExcepthandlerAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/ExcepthandlerAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,37 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.excepthandlerType;
+import org.python.antlr.ast.Num;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExcepthandlerAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(excepthandlerType.class);
+ }
+ if (o instanceof excepthandlerType) {
+ return o;
+ }
+
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to excepthandler node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<excepthandlerType> excepthandlers = new ArrayList<excepthandlerType>();
+ for(Object o : (Iterable)iter) {
+ excepthandlers.add((excepthandlerType)adapt(o));
+ }
+ return excepthandlers;
+ }
+
+}
Added: branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/ExprAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,40 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyInteger;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.exprType;
+import org.python.antlr.ast.Num;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExprAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(exprType.class);
+ }
+ if (o instanceof exprType) {
+ return 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 Object adaptIter(Object iter) {
+ List<exprType> exprs = new ArrayList<exprType>();
+ for(Object o : (Iterable)iter) {
+ exprs.add((exprType)adapt(o));
+ }
+ return exprs;
+ }
+
+}
Added: branches/astwrite/src/org/python/antlr/adapter/IdentifierAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/IdentifierAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/IdentifierAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,36 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.Num;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class IdentifierAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(String.class);
+ }
+ if (o instanceof String) {
+ return o;
+ }
+
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to identifier node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<String> identifiers = new ArrayList<String>();
+ for(Object o : (Iterable)iter) {
+ identifiers.add((String)adapt(o));
+ }
+ return identifiers;
+ }
+
+}
Added: branches/astwrite/src/org/python/antlr/adapter/KeywordAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/KeywordAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/KeywordAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,35 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.keywordType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class KeywordAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(keywordType.class);
+ }
+ if (o instanceof keywordType) {
+ return o;
+ }
+
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to keyword node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<keywordType> keywords = new ArrayList<keywordType>();
+ for(Object o : (Iterable)iter) {
+ keywords.add((keywordType)adapt(o));
+ }
+ return keywords;
+ }
+}
Modified: branches/astwrite/src/org/python/antlr/adapter/ListWrapper.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/ListWrapper.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/adapter/ListWrapper.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -5,18 +5,23 @@
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+
+import org.python.core.Py;
import org.python.core.PyObject;
public class ListWrapper implements List {
private List list;
- private AstObjectAdapter adapter;
+ private AstAdapter adapter;
public ListWrapper(List list) {
+ if (list == null) {
+ throw Py.TypeError("AST list can't be None");
+ }
this.list = list;
}
- public ListWrapper(List list, AstObjectAdapter adapter) {
+ public ListWrapper(List list, AstAdapter adapter) {
this.adapter = adapter;
this.list = list;
}
Added: branches/astwrite/src/org/python/antlr/adapter/SliceAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/SliceAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/SliceAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,37 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.sliceType;
+import org.python.antlr.ast.Num;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SliceAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(sliceType.class);
+ }
+ if (o instanceof sliceType) {
+ return o;
+ }
+
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to slice node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<sliceType> slices = new ArrayList<sliceType>();
+ for(Object o : (Iterable)iter) {
+ slices.add((sliceType)adapt(o));
+ }
+ return slices;
+ }
+
+}
Copied: branches/astwrite/src/org/python/antlr/adapter/StmtAdapter.java (from rev 5636, branches/astwrite/src/org/python/antlr/adapter/StmtListAdapter.java)
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/StmtAdapter.java (rev 0)
+++ branches/astwrite/src/org/python/antlr/adapter/StmtAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -0,0 +1,34 @@
+package org.python.antlr.adapter;
+
+import org.python.core.Py;
+import org.python.core.PyJavaInstance;
+
+import org.python.antlr.ast.stmtType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StmtAdapter implements AstAdapter {
+
+ public Object adapt(Object o) {
+ if (o == null) {
+ return o;
+ }
+ if (o instanceof PyJavaInstance) {
+ o = ((PyJavaInstance)o).__tojava__(stmtType.class);
+ }
+ if (o instanceof stmtType) {
+ return o;
+ }
+ //FIXME: investigate the right exception
+ throw Py.TypeError("Can't convert " + o.getClass().getName() + " to stmt node");
+ }
+
+ public Object adaptIter(Object iter) {
+ List<stmtType> stmts = new ArrayList<stmtType>();
+ for(Object o : (Iterable)iter) {
+ stmts.add((stmtType)adapt(o));
+ }
+ return stmts;
+ }
+}
Deleted: branches/astwrite/src/org/python/antlr/adapter/StmtListAdapter.java
===================================================================
--- branches/astwrite/src/org/python/antlr/adapter/StmtListAdapter.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/adapter/StmtListAdapter.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -1,22 +0,0 @@
-package org.python.antlr.adapter;
-
-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/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return targets;
}
public Object getTargets() {
- return new ListWrapper(targets);
+ return new ListWrapper(targets, AstAdapters.exprAdapter);
}
public void setTargets(Object targets) {
this.targets = AstAdapters.to_exprList(targets);
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return values;
}
public Object getValues() {
- return new ListWrapper(values);
+ return new ListWrapper(values, AstAdapters.exprAdapter);
}
public void setValues(Object values) {
this.values = AstAdapters.to_exprList(values);
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return args;
}
public Object getArgs() {
- return new ListWrapper(args);
+ return new ListWrapper(args, AstAdapters.exprAdapter);
}
public void setArgs(Object args) {
this.args = AstAdapters.to_exprList(args);
@@ -37,7 +37,7 @@
return keywords;
}
public Object getKeywords() {
- return new ListWrapper(keywords);
+ return new ListWrapper(keywords, AstAdapters.keywordAdapter);
}
public void setKeywords(Object keywords) {
this.keywords = AstAdapters.to_keywordList(keywords);
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return bases;
}
public Object getBases() {
- return new ListWrapper(bases);
+ return new ListWrapper(bases, AstAdapters.exprAdapter);
}
public void setBases(Object bases) {
this.bases = AstAdapters.to_exprList(bases);
@@ -37,7 +37,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -48,7 +48,7 @@
return decorators;
}
public Object getDecorators() {
- return new ListWrapper(decorators);
+ return new ListWrapper(decorators, AstAdapters.exprAdapter);
}
public void setDecorators(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return ops;
}
public Object getOps() {
- return new ListWrapper(ops);
+ return new ListWrapper(ops, AstAdapters.cmpopAdapter);
}
public void setOps(Object ops) {
this.ops = AstAdapters.to_cmpopList(ops);
@@ -37,7 +37,7 @@
return comparators;
}
public Object getComparators() {
- return new ListWrapper(comparators);
+ return new ListWrapper(comparators, AstAdapters.exprAdapter);
}
public void setComparators(Object comparators) {
this.comparators = AstAdapters.to_exprList(comparators);
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return targets;
}
public Object getTargets() {
- return new ListWrapper(targets);
+ return new ListWrapper(targets, AstAdapters.exprAdapter);
}
public void setTargets(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return keys;
}
public Object getKeys() {
- return new ListWrapper(keys);
+ return new ListWrapper(keys, AstAdapters.exprAdapter);
}
public void setKeys(Object keys) {
this.keys = AstAdapters.to_exprList(keys);
@@ -26,7 +26,7 @@
return values;
}
public Object getValues() {
- return new ListWrapper(values);
+ return new ListWrapper(values, AstAdapters.exprAdapter);
}
public void setValues(Object values) {
this.values = AstAdapters.to_exprList(values);
Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return dims;
}
public Object getDims() {
- return new ListWrapper(dims);
+ return new ListWrapper(dims, AstAdapters.sliceAdapter);
}
public void setDims(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -37,7 +37,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -48,7 +48,7 @@
return orelse;
}
public Object getOrelse() {
- return new ListWrapper(orelse);
+ return new ListWrapper(orelse, AstAdapters.stmtAdapter);
}
public void setOrelse(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -37,7 +37,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -48,7 +48,7 @@
return decorators;
}
public Object getDecorators() {
- return new ListWrapper(decorators);
+ return new ListWrapper(decorators, AstAdapters.exprAdapter);
}
public void setDecorators(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return generators;
}
public Object getGenerators() {
- return new ListWrapper(generators);
+ return new ListWrapper(generators, AstAdapters.comprehensionAdapter);
}
public void setGenerators(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return names;
}
public Object getNames() {
- return new ListWrapper(names);
+ return new ListWrapper(names, AstAdapters.identifierAdapter);
}
public void setNames(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -37,7 +37,7 @@
return orelse;
}
public Object getOrelse() {
- return new ListWrapper(orelse);
+ return new ListWrapper(orelse, AstAdapters.stmtAdapter);
}
public void setOrelse(Object orelse) {
this.orelse = AstAdapters.to_stmtList(orelse);
Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return names;
}
public Object getNames() {
- return new ListWrapper(names);
+ return new ListWrapper(names, AstAdapters.aliasAdapter);
}
public void setNames(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return names;
}
public Object getNames() {
- return new ListWrapper(names);
+ return new ListWrapper(names, AstAdapters.aliasAdapter);
}
public void setNames(Object names) {
this.names = AstAdapters.to_aliasList(names);
Modified: branches/astwrite/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return elts;
}
public Object getElts() {
- return new ListWrapper(elts);
+ return new ListWrapper(elts, AstAdapters.exprAdapter);
}
public void setElts(Object elts) {
this.elts = AstAdapters.to_exprList(elts);
Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return generators;
}
public Object getGenerators() {
- return new ListWrapper(generators);
+ return new ListWrapper(generators, AstAdapters.comprehensionAdapter);
}
public void setGenerators(Object 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-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Module.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return values;
}
public Object getValues() {
- return new ListWrapper(values);
+ return new ListWrapper(values, AstAdapters.exprAdapter);
}
public void setValues(Object values) {
this.values = AstAdapters.to_exprList(values);
Modified: branches/astwrite/src/org/python/antlr/ast/Suite.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Suite.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Suite.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
Modified: branches/astwrite/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -26,7 +26,7 @@
return handlers;
}
public Object getHandlers() {
- return new ListWrapper(handlers);
+ return new ListWrapper(handlers, AstAdapters.excepthandlerAdapter);
}
public void setHandlers(Object handlers) {
this.handlers = AstAdapters.to_excepthandlerList(handlers);
@@ -37,7 +37,7 @@
return orelse;
}
public Object getOrelse() {
- return new ListWrapper(orelse);
+ return new ListWrapper(orelse, AstAdapters.stmtAdapter);
}
public void setOrelse(Object orelse) {
this.orelse = AstAdapters.to_stmtList(orelse);
Modified: branches/astwrite/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -26,7 +26,7 @@
return finalbody;
}
public Object getFinalbody() {
- return new ListWrapper(finalbody);
+ return new ListWrapper(finalbody, AstAdapters.stmtAdapter);
}
public void setFinalbody(Object finalbody) {
this.finalbody = AstAdapters.to_stmtList(finalbody);
Modified: branches/astwrite/src/org/python/antlr/ast/Tuple.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return elts;
}
public Object getElts() {
- return new ListWrapper(elts);
+ return new ListWrapper(elts, AstAdapters.exprAdapter);
}
public void setElts(Object elts) {
this.elts = AstAdapters.to_exprList(elts);
Modified: branches/astwrite/src/org/python/antlr/ast/While.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/While.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/While.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -26,7 +26,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
@@ -37,7 +37,7 @@
return orelse;
}
public Object getOrelse() {
- return new ListWrapper(orelse);
+ return new ListWrapper(orelse, AstAdapters.stmtAdapter);
}
public void setOrelse(Object orelse) {
this.orelse = AstAdapters.to_stmtList(orelse);
Modified: branches/astwrite/src/org/python/antlr/ast/With.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/With.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/With.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -37,7 +37,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
Modified: branches/astwrite/src/org/python/antlr/ast/argumentsType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/argumentsType.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/argumentsType.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -15,7 +15,7 @@
return args;
}
public Object getArgs() {
- return new ListWrapper(args);
+ return new ListWrapper(args, AstAdapters.exprAdapter);
}
public void setArgs(Object args) {
this.args = AstAdapters.to_exprList(args);
@@ -48,7 +48,7 @@
return defaults;
}
public Object getDefaults() {
- return new ListWrapper(defaults);
+ return new ListWrapper(defaults, AstAdapters.exprAdapter);
}
public void setDefaults(Object defaults) {
this.defaults = AstAdapters.to_exprList(defaults);
Modified: branches/astwrite/src/org/python/antlr/ast/comprehensionType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/comprehensionType.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/comprehensionType.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -37,7 +37,7 @@
return ifs;
}
public Object getIfs() {
- return new ListWrapper(ifs);
+ return new ListWrapper(ifs, AstAdapters.exprAdapter);
}
public void setIfs(Object ifs) {
this.ifs = AstAdapters.to_exprList(ifs);
Modified: branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java 2008-11-25 21:09:57 UTC (rev 5640)
+++ branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java 2008-11-26 03:42:02 UTC (rev 5641)
@@ -37,7 +37,7 @@
return body;
}
public Object getBody() {
- return new ListWrapper(body);
+ return new ListWrapper(body, AstAdapters.stmtAdapter);
}
public void setBody(Object body) {
this.body = AstAdapters.to_stmtList(body);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
