Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5595] branches/astwrite
|
From: <fwi...@us...> - 2008-11-20 23:44:14
|
Revision: 5595
http://jython.svn.sourceforge.net/jython/?rev=5595&view=rev
Author: fwierzbicki
Date: 2008-11-20 23:44:08 +0000 (Thu, 20 Nov 2008)
Log Message:
-----------
Oops missed a spot for wrapping with ListWrapper.
Modified Paths:
--------------
branches/astwrite/ast/asdl_antlr.py
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
Modified: branches/astwrite/ast/asdl_antlr.py
===================================================================
--- branches/astwrite/ast/asdl_antlr.py 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/ast/asdl_antlr.py 2008-11-20 23:44:08 UTC (rev 5595)
@@ -291,8 +291,15 @@
def javaConstructorHelper(self, fields, depth):
for f in fields:
- self.emit("this.%s = %s;" % (f.name, f.name), depth+1)
- #self.emit("set%s(%s);" % (str(f.name).capitalize(), f.name), depth+1)
+ #XXX: old version:
+ #self.emit("this.%s = %s;" % (f.name, f.name), depth+1)
+ #XXX: code cut and pasted from visitField
+ if f.seq:
+ self.emit("this.%s = new %s(%s);" % (f.name,
+ self.javaType(f, True), f.name), depth+1)
+ else:
+ self.emit("this.%s = %s;" % (f.name, f.name), depth+1)
+
fparg = self.fieldDef(f)
not_simple = True
Modified: branches/astwrite/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Assign.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -29,7 +29,7 @@
public String[] get_fields() { return fields; }
public Assign(java.util.List<exprType> targets, exprType value) {
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -42,7 +42,7 @@
public Assign(Token token, java.util.List<exprType> targets, exprType
value) {
super(token);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -55,7 +55,7 @@
public Assign(int ttype, Token token, java.util.List<exprType> targets,
exprType value) {
super(ttype, token);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -68,7 +68,7 @@
public Assign(PythonTree tree, java.util.List<exprType> targets, exprType
value) {
super(tree);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/BoolOp.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -30,7 +30,7 @@
public BoolOp(boolopType op, java.util.List<exprType> values) {
this.op = op;
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -41,7 +41,7 @@
public BoolOp(Token token, boolopType op, java.util.List<exprType> values) {
super(token);
this.op = op;
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -53,7 +53,7 @@
java.util.List<exprType> values) {
super(ttype, token);
this.op = op;
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -65,7 +65,7 @@
values) {
super(tree);
this.op = op;
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Call.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -58,13 +58,13 @@
java.util.List<keywordType> keywords, exprType starargs, exprType kwargs) {
this.func = func;
addChild(func);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
}
}
- this.keywords = keywords;
+ this.keywords = new ListWrapper<keywordType>(keywords);
if (keywords != null) {
for(PythonTree t : keywords) {
addChild(t);
@@ -81,13 +81,13 @@
super(token);
this.func = func;
addChild(func);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
}
}
- this.keywords = keywords;
+ this.keywords = new ListWrapper<keywordType>(keywords);
if (keywords != null) {
for(PythonTree t : keywords) {
addChild(t);
@@ -105,13 +105,13 @@
super(ttype, token);
this.func = func;
addChild(func);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
}
}
- this.keywords = keywords;
+ this.keywords = new ListWrapper<keywordType>(keywords);
if (keywords != null) {
for(PythonTree t : keywords) {
addChild(t);
@@ -128,13 +128,13 @@
super(tree);
this.func = func;
addChild(func);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
}
}
- this.keywords = keywords;
+ this.keywords = new ListWrapper<keywordType>(keywords);
if (keywords != null) {
for(PythonTree t : keywords) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/ClassDef.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -48,19 +48,19 @@
public ClassDef(String name, java.util.List<exprType> bases,
java.util.List<stmtType> body, java.util.List<exprType> decorators) {
this.name = name;
- this.bases = bases;
+ this.bases = new ListWrapper<exprType>(bases);
if (bases != null) {
for(PythonTree t : bases) {
addChild(t);
}
}
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -72,19 +72,19 @@
java.util.List<stmtType> body, java.util.List<exprType> decorators) {
super(token);
this.name = name;
- this.bases = bases;
+ this.bases = new ListWrapper<exprType>(bases);
if (bases != null) {
for(PythonTree t : bases) {
addChild(t);
}
}
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -97,19 +97,19 @@
java.util.List<exprType> decorators) {
super(ttype, token);
this.name = name;
- this.bases = bases;
+ this.bases = new ListWrapper<exprType>(bases);
if (bases != null) {
for(PythonTree t : bases) {
addChild(t);
}
}
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -121,19 +121,19 @@
bases, java.util.List<stmtType> body, java.util.List<exprType> decorators) {
super(tree);
this.name = name;
- this.bases = bases;
+ this.bases = new ListWrapper<exprType>(bases);
if (bases != null) {
for(PythonTree t : bases) {
addChild(t);
}
}
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Compare.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -41,8 +41,8 @@
java.util.List<exprType> comparators) {
this.left = left;
addChild(left);
- this.ops = ops;
- this.comparators = comparators;
+ this.ops = new ListWrapper<cmpopType>(ops);
+ this.comparators = new ListWrapper<exprType>(comparators);
if (comparators != null) {
for(PythonTree t : comparators) {
addChild(t);
@@ -55,8 +55,8 @@
super(token);
this.left = left;
addChild(left);
- this.ops = ops;
- this.comparators = comparators;
+ this.ops = new ListWrapper<cmpopType>(ops);
+ this.comparators = new ListWrapper<exprType>(comparators);
if (comparators != null) {
for(PythonTree t : comparators) {
addChild(t);
@@ -69,8 +69,8 @@
super(ttype, token);
this.left = left;
addChild(left);
- this.ops = ops;
- this.comparators = comparators;
+ this.ops = new ListWrapper<cmpopType>(ops);
+ this.comparators = new ListWrapper<exprType>(comparators);
if (comparators != null) {
for(PythonTree t : comparators) {
addChild(t);
@@ -83,8 +83,8 @@
super(tree);
this.left = left;
addChild(left);
- this.ops = ops;
- this.comparators = comparators;
+ this.ops = new ListWrapper<cmpopType>(ops);
+ this.comparators = new ListWrapper<exprType>(comparators);
if (comparators != null) {
for(PythonTree t : comparators) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Delete.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public Delete(java.util.List<exprType> targets) {
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -31,7 +31,7 @@
public Delete(Token token, java.util.List<exprType> targets) {
super(token);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -41,7 +41,7 @@
public Delete(int ttype, Token token, java.util.List<exprType> targets) {
super(ttype, token);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
@@ -51,7 +51,7 @@
public Delete(PythonTree tree, java.util.List<exprType> targets) {
super(tree);
- this.targets = targets;
+ this.targets = new ListWrapper<exprType>(targets);
if (targets != null) {
for(PythonTree t : targets) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Dict.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -30,13 +30,13 @@
public Dict(java.util.List<exprType> keys, java.util.List<exprType> values)
{
- this.keys = keys;
+ this.keys = new ListWrapper<exprType>(keys);
if (keys != null) {
for(PythonTree t : keys) {
addChild(t);
}
}
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -47,13 +47,13 @@
public Dict(Token token, java.util.List<exprType> keys,
java.util.List<exprType> values) {
super(token);
- this.keys = keys;
+ this.keys = new ListWrapper<exprType>(keys);
if (keys != null) {
for(PythonTree t : keys) {
addChild(t);
}
}
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -64,13 +64,13 @@
public Dict(int ttype, Token token, java.util.List<exprType> keys,
java.util.List<exprType> values) {
super(ttype, token);
- this.keys = keys;
+ this.keys = new ListWrapper<exprType>(keys);
if (keys != null) {
for(PythonTree t : keys) {
addChild(t);
}
}
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -81,13 +81,13 @@
public Dict(PythonTree tree, java.util.List<exprType> keys,
java.util.List<exprType> values) {
super(tree);
- this.keys = keys;
+ this.keys = new ListWrapper<exprType>(keys);
if (keys != null) {
for(PythonTree t : keys) {
addChild(t);
}
}
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/ExtSlice.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public ExtSlice(java.util.List<sliceType> dims) {
- this.dims = dims;
+ this.dims = new ListWrapper<sliceType>(dims);
if (dims != null) {
for(PythonTree t : dims) {
addChild(t);
@@ -31,7 +31,7 @@
public ExtSlice(Token token, java.util.List<sliceType> dims) {
super(token);
- this.dims = dims;
+ this.dims = new ListWrapper<sliceType>(dims);
if (dims != null) {
for(PythonTree t : dims) {
addChild(t);
@@ -41,7 +41,7 @@
public ExtSlice(int ttype, Token token, java.util.List<sliceType> dims) {
super(ttype, token);
- this.dims = dims;
+ this.dims = new ListWrapper<sliceType>(dims);
if (dims != null) {
for(PythonTree t : dims) {
addChild(t);
@@ -51,7 +51,7 @@
public ExtSlice(PythonTree tree, java.util.List<sliceType> dims) {
super(tree);
- this.dims = dims;
+ this.dims = new ListWrapper<sliceType>(dims);
if (dims != null) {
for(PythonTree t : dims) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/For.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/For.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/For.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -51,13 +51,13 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -72,13 +72,13 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -93,13 +93,13 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -114,13 +114,13 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/FunctionDef.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -49,13 +49,13 @@
java.util.List<stmtType> body, java.util.List<exprType> decorators) {
this.name = name;
this.args = args;
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -68,13 +68,13 @@
super(token);
this.name = name;
this.args = args;
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -87,13 +87,13 @@
super(ttype, token);
this.name = name;
this.args = args;
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
@@ -106,13 +106,13 @@
super(tree);
this.name = name;
this.args = args;
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.decorators = decorators;
+ this.decorators = new ListWrapper<exprType>(decorators);
if (decorators != null) {
for(PythonTree t : decorators) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/GeneratorExp.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -32,7 +32,7 @@
generators) {
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -45,7 +45,7 @@
super(token);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -58,7 +58,7 @@
super(ttype, token);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -71,7 +71,7 @@
super(tree);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Global.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Global.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,22 +21,22 @@
public String[] get_fields() { return fields; }
public Global(java.util.List<String> names) {
- this.names = names;
+ this.names = new ListWrapper<String>(names);
}
public Global(Token token, java.util.List<String> names) {
super(token);
- this.names = names;
+ this.names = new ListWrapper<String>(names);
}
public Global(int ttype, Token token, java.util.List<String> names) {
super(ttype, token);
- this.names = names;
+ this.names = new ListWrapper<String>(names);
}
public Global(PythonTree tree, java.util.List<String> names) {
super(tree);
- this.names = names;
+ this.names = new ListWrapper<String>(names);
}
public String toString() {
Modified: branches/astwrite/src/org/python/antlr/ast/If.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/If.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/If.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -41,13 +41,13 @@
java.util.List<stmtType> orelse) {
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -60,13 +60,13 @@
super(token);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -79,13 +79,13 @@
super(ttype, token);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -98,13 +98,13 @@
super(tree);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Import.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public Import(java.util.List<aliasType> names) {
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -31,7 +31,7 @@
public Import(Token token, java.util.List<aliasType> names) {
super(token);
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -41,7 +41,7 @@
public Import(int ttype, Token token, java.util.List<aliasType> names) {
super(ttype, token);
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -51,7 +51,7 @@
public Import(PythonTree tree, java.util.List<aliasType> names) {
super(tree);
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/ImportFrom.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -40,7 +40,7 @@
public ImportFrom(String module, java.util.List<aliasType> names, int
level) {
this.module = module;
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -53,7 +53,7 @@
names, int level) {
super(token);
this.module = module;
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -66,7 +66,7 @@
java.util.List<aliasType> names, int level) {
super(ttype, token);
this.module = module;
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
@@ -79,7 +79,7 @@
names, int level) {
super(tree);
this.module = module;
- this.names = names;
+ this.names = new ListWrapper<aliasType>(names);
if (names != null) {
for(PythonTree t : names) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Interactive.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public Interactive(java.util.List<stmtType> body) {
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -31,7 +31,7 @@
public Interactive(Token token, java.util.List<stmtType> body) {
super(token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -41,7 +41,7 @@
public Interactive(int ttype, Token token, java.util.List<stmtType> body) {
super(ttype, token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -51,7 +51,7 @@
public Interactive(PythonTree tree, java.util.List<stmtType> body) {
super(tree);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/List.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/List.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -29,7 +29,7 @@
public String[] get_fields() { return fields; }
public List(java.util.List<exprType> elts, expr_contextType ctx) {
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -41,7 +41,7 @@
public List(Token token, java.util.List<exprType> elts, expr_contextType
ctx) {
super(token);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -53,7 +53,7 @@
public List(int ttype, Token token, java.util.List<exprType> elts,
expr_contextType ctx) {
super(ttype, token);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -65,7 +65,7 @@
public List(PythonTree tree, java.util.List<exprType> elts,
expr_contextType ctx) {
super(tree);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/ListComp.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -32,7 +32,7 @@
{
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -45,7 +45,7 @@
super(token);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -58,7 +58,7 @@
super(ttype, token);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
@@ -71,7 +71,7 @@
super(tree);
this.elt = elt;
addChild(elt);
- this.generators = generators;
+ this.generators = new ListWrapper<comprehensionType>(generators);
if (generators != null) {
for(PythonTree t : generators) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Module.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Module.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Module.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public Module(java.util.List<stmtType> body) {
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -31,7 +31,7 @@
public Module(Token token, java.util.List<stmtType> body) {
super(token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -41,7 +41,7 @@
public Module(int ttype, Token token, java.util.List<stmtType> body) {
super(ttype, token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -51,7 +51,7 @@
public Module(PythonTree tree, java.util.List<stmtType> body) {
super(tree);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Print.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -40,7 +40,7 @@
public Print(exprType dest, java.util.List<exprType> values, boolean nl) {
this.dest = dest;
addChild(dest);
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -54,7 +54,7 @@
super(token);
this.dest = dest;
addChild(dest);
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -68,7 +68,7 @@
super(ttype, token);
this.dest = dest;
addChild(dest);
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
@@ -82,7 +82,7 @@
super(tree);
this.dest = dest;
addChild(dest);
- this.values = values;
+ this.values = new ListWrapper<exprType>(values);
if (values != null) {
for(PythonTree t : values) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Suite.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Suite.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Suite.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -21,7 +21,7 @@
public String[] get_fields() { return fields; }
public Suite(java.util.List<stmtType> body) {
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -31,7 +31,7 @@
public Suite(Token token, java.util.List<stmtType> body) {
super(token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -41,7 +41,7 @@
public Suite(int ttype, Token token, java.util.List<stmtType> body) {
super(ttype, token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -51,7 +51,7 @@
public Suite(PythonTree tree, java.util.List<stmtType> body) {
super(tree);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/TryExcept.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -40,19 +40,19 @@
public TryExcept(java.util.List<stmtType> body,
java.util.List<excepthandlerType> handlers, java.util.List<stmtType>
orelse) {
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.handlers = handlers;
+ this.handlers = new ListWrapper<excepthandlerType>(handlers);
if (handlers != null) {
for(PythonTree t : handlers) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -64,19 +64,19 @@
java.util.List<excepthandlerType> handlers, java.util.List<stmtType>
orelse) {
super(token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.handlers = handlers;
+ this.handlers = new ListWrapper<excepthandlerType>(handlers);
if (handlers != null) {
for(PythonTree t : handlers) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -88,19 +88,19 @@
java.util.List<excepthandlerType> handlers, java.util.List<stmtType>
orelse) {
super(ttype, token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.handlers = handlers;
+ this.handlers = new ListWrapper<excepthandlerType>(handlers);
if (handlers != null) {
for(PythonTree t : handlers) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -112,19 +112,19 @@
java.util.List<excepthandlerType> handlers, java.util.List<stmtType>
orelse) {
super(tree);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.handlers = handlers;
+ this.handlers = new ListWrapper<excepthandlerType>(handlers);
if (handlers != null) {
for(PythonTree t : handlers) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/TryFinally.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -30,13 +30,13 @@
public TryFinally(java.util.List<stmtType> body, java.util.List<stmtType>
finalbody) {
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.finalbody = finalbody;
+ this.finalbody = new ListWrapper<stmtType>(finalbody);
if (finalbody != null) {
for(PythonTree t : finalbody) {
addChild(t);
@@ -47,13 +47,13 @@
public TryFinally(Token token, java.util.List<stmtType> body,
java.util.List<stmtType> finalbody) {
super(token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.finalbody = finalbody;
+ this.finalbody = new ListWrapper<stmtType>(finalbody);
if (finalbody != null) {
for(PythonTree t : finalbody) {
addChild(t);
@@ -64,13 +64,13 @@
public TryFinally(int ttype, Token token, java.util.List<stmtType> body,
java.util.List<stmtType> finalbody) {
super(ttype, token);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.finalbody = finalbody;
+ this.finalbody = new ListWrapper<stmtType>(finalbody);
if (finalbody != null) {
for(PythonTree t : finalbody) {
addChild(t);
@@ -81,13 +81,13 @@
public TryFinally(PythonTree tree, java.util.List<stmtType> body,
java.util.List<stmtType> finalbody) {
super(tree);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.finalbody = finalbody;
+ this.finalbody = new ListWrapper<stmtType>(finalbody);
if (finalbody != null) {
for(PythonTree t : finalbody) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/Tuple.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/Tuple.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -29,7 +29,7 @@
public String[] get_fields() { return fields; }
public Tuple(java.util.List<exprType> elts, expr_contextType ctx) {
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -41,7 +41,7 @@
public Tuple(Token token, java.util.List<exprType> elts, expr_contextType
ctx) {
super(token);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -53,7 +53,7 @@
public Tuple(int ttype, Token token, java.util.List<exprType> elts,
expr_contextType ctx) {
super(ttype, token);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
@@ -65,7 +65,7 @@
public Tuple(PythonTree tree, java.util.List<exprType> elts,
expr_contextType ctx) {
super(tree);
- this.elts = elts;
+ this.elts = new ListWrapper<exprType>(elts);
if (elts != null) {
for(PythonTree t : elts) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/While.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/While.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/While.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -41,13 +41,13 @@
java.util.List<stmtType> orelse) {
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -60,13 +60,13 @@
super(token);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -79,13 +79,13 @@
super(ttype, token);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
@@ -98,13 +98,13 @@
super(tree);
this.test = test;
addChild(test);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
}
}
- this.orelse = orelse;
+ this.orelse = new ListWrapper<stmtType>(orelse);
if (orelse != null) {
for(PythonTree t : orelse) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/With.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/With.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/With.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -44,7 +44,7 @@
addChild(context_expr);
this.optional_vars = optional_vars;
addChild(optional_vars);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -59,7 +59,7 @@
addChild(context_expr);
this.optional_vars = optional_vars;
addChild(optional_vars);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -74,7 +74,7 @@
addChild(context_expr);
this.optional_vars = optional_vars;
addChild(optional_vars);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -89,7 +89,7 @@
addChild(context_expr);
this.optional_vars = optional_vars;
addChild(optional_vars);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/argumentsType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/argumentsType.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/argumentsType.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -47,7 +47,7 @@
public argumentsType(java.util.List<exprType> args, String vararg, String
kwarg, java.util.List<exprType> defaults) {
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
@@ -55,7 +55,7 @@
}
this.vararg = vararg;
this.kwarg = kwarg;
- this.defaults = defaults;
+ this.defaults = new ListWrapper<exprType>(defaults);
if (defaults != null) {
for(PythonTree t : defaults) {
addChild(t);
@@ -66,7 +66,7 @@
public argumentsType(Token token, java.util.List<exprType> args, String
vararg, String kwarg, java.util.List<exprType> defaults) {
super(token);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
@@ -74,7 +74,7 @@
}
this.vararg = vararg;
this.kwarg = kwarg;
- this.defaults = defaults;
+ this.defaults = new ListWrapper<exprType>(defaults);
if (defaults != null) {
for(PythonTree t : defaults) {
addChild(t);
@@ -85,7 +85,7 @@
public argumentsType(int ttype, Token token, java.util.List<exprType> args,
String vararg, String kwarg, java.util.List<exprType> defaults) {
super(ttype, token);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
@@ -93,7 +93,7 @@
}
this.vararg = vararg;
this.kwarg = kwarg;
- this.defaults = defaults;
+ this.defaults = new ListWrapper<exprType>(defaults);
if (defaults != null) {
for(PythonTree t : defaults) {
addChild(t);
@@ -104,7 +104,7 @@
public argumentsType(PythonTree tree, java.util.List<exprType> args, String
vararg, String kwarg, java.util.List<exprType> defaults) {
super(tree);
- this.args = args;
+ this.args = new ListWrapper<exprType>(args);
if (args != null) {
for(PythonTree t : args) {
addChild(t);
@@ -112,7 +112,7 @@
}
this.vararg = vararg;
this.kwarg = kwarg;
- this.defaults = defaults;
+ this.defaults = new ListWrapper<exprType>(defaults);
if (defaults != null) {
for(PythonTree t : defaults) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/comprehensionType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/comprehensionType.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/comprehensionType.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -43,7 +43,7 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.ifs = ifs;
+ this.ifs = new ListWrapper<exprType>(ifs);
if (ifs != null) {
for(PythonTree t : ifs) {
addChild(t);
@@ -58,7 +58,7 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.ifs = ifs;
+ this.ifs = new ListWrapper<exprType>(ifs);
if (ifs != null) {
for(PythonTree t : ifs) {
addChild(t);
@@ -73,7 +73,7 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.ifs = ifs;
+ this.ifs = new ListWrapper<exprType>(ifs);
if (ifs != null) {
for(PythonTree t : ifs) {
addChild(t);
@@ -88,7 +88,7 @@
addChild(target);
this.iter = iter;
addChild(iter);
- this.ifs = ifs;
+ this.ifs = new ListWrapper<exprType>(ifs);
if (ifs != null) {
for(PythonTree t : ifs) {
addChild(t);
Modified: branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java
===================================================================
--- branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java 2008-11-20 22:22:29 UTC (rev 5594)
+++ branches/astwrite/src/org/python/antlr/ast/excepthandlerType.java 2008-11-20 23:44:08 UTC (rev 5595)
@@ -60,7 +60,7 @@
addChild(excepttype);
this.name = name;
addChild(name);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -77,7 +77,7 @@
addChild(excepttype);
this.name = name;
addChild(name);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -94,7 +94,7 @@
addChild(excepttype);
this.name = name;
addChild(name);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
@@ -111,7 +111,7 @@
addChild(excepttype);
this.name = name;
addChild(name);
- this.body = body;
+ this.body = new ListWrapper<stmtType>(body);
if (body != null) {
for(PythonTree t : body) {
addChild(t);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
