Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[5237] branches/nowalker
|
From: <fwi...@us...> - 2008-08-23 02:33:53
|
Revision: 5237
http://jython.svn.sourceforge.net/jython/?rev=5237&view=rev
Author: fwierzbicki
Date: 2008-08-23 02:33:48 +0000 (Sat, 23 Aug 2008)
Log Message:
-----------
Add expr types to BaseTree children.
Modified Paths:
--------------
branches/nowalker/ast/asdl_antlr.py
branches/nowalker/src/org/python/antlr/GrammarActions.java
branches/nowalker/src/org/python/antlr/ast/Assert.java
branches/nowalker/src/org/python/antlr/ast/Assign.java
branches/nowalker/src/org/python/antlr/ast/Attribute.java
branches/nowalker/src/org/python/antlr/ast/AugAssign.java
branches/nowalker/src/org/python/antlr/ast/BinOp.java
branches/nowalker/src/org/python/antlr/ast/Call.java
branches/nowalker/src/org/python/antlr/ast/Compare.java
branches/nowalker/src/org/python/antlr/ast/Exec.java
branches/nowalker/src/org/python/antlr/ast/Expr.java
branches/nowalker/src/org/python/antlr/ast/Expression.java
branches/nowalker/src/org/python/antlr/ast/For.java
branches/nowalker/src/org/python/antlr/ast/GeneratorExp.java
branches/nowalker/src/org/python/antlr/ast/If.java
branches/nowalker/src/org/python/antlr/ast/IfExp.java
branches/nowalker/src/org/python/antlr/ast/Index.java
branches/nowalker/src/org/python/antlr/ast/Lambda.java
branches/nowalker/src/org/python/antlr/ast/ListComp.java
branches/nowalker/src/org/python/antlr/ast/Print.java
branches/nowalker/src/org/python/antlr/ast/Raise.java
branches/nowalker/src/org/python/antlr/ast/Repr.java
branches/nowalker/src/org/python/antlr/ast/Return.java
branches/nowalker/src/org/python/antlr/ast/Slice.java
branches/nowalker/src/org/python/antlr/ast/Subscript.java
branches/nowalker/src/org/python/antlr/ast/UnaryOp.java
branches/nowalker/src/org/python/antlr/ast/While.java
branches/nowalker/src/org/python/antlr/ast/With.java
branches/nowalker/src/org/python/antlr/ast/Yield.java
branches/nowalker/src/org/python/antlr/ast/comprehensionType.java
branches/nowalker/src/org/python/antlr/ast/excepthandlerType.java
branches/nowalker/src/org/python/antlr/ast/keywordType.java
Modified: branches/nowalker/ast/asdl_antlr.py
===================================================================
--- branches/nowalker/ast/asdl_antlr.py 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/ast/asdl_antlr.py 2008-08-23 02:33:48 UTC (rev 5237)
@@ -260,12 +260,15 @@
if f.typedef is not None and f.typedef.simple:
not_simple = False
#For now ignoring String -- will want to revisit
- if f.seq and not_simple and not fparg.startswith("String"):
- self.emit("if (%s != null) {" % f.name, depth+1);
- self.emit("for(int i%(name)s=0;i%(name)s<%(name)s.length;i%(name)s++) {" % {"name":f.name}, depth+2)
- self.emit("addChild(%s[i%s]);" % (f.name, f.name), depth+3)
- self.emit("}", depth+2)
- self.emit("}", depth+1)
+ if not_simple and not fparg.startswith("String"):
+ if f.seq:
+ self.emit("if (%s != null) {" % f.name, depth+1);
+ self.emit("for(int i%(name)s=0;i%(name)s<%(name)s.length;i%(name)s++) {" % {"name":f.name}, depth+2)
+ self.emit("addChild(%s[i%s]);" % (f.name, f.name), depth+3)
+ self.emit("}", depth+2)
+ self.emit("}", depth+1)
+ elif str(f.type) == "expr":
+ self.emit("addChild(%s);" % (f.name), depth+1)
def javaMethods(self, type, clsname, ctorname, fields, depth):
# The java ctors
Modified: branches/nowalker/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/nowalker/src/org/python/antlr/GrammarActions.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/GrammarActions.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -303,7 +303,7 @@
((Context)tree).setContext(context);
}
for (int i=0; i<tree.getChildCount(); i++) {
- recurseSetContext(tree.getChild(i), context);
+ recurseSetContext(tree.getChild(i), context);
}
}
Modified: branches/nowalker/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Assert.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Assert.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -15,19 +15,25 @@
public Assert(Token token, exprType test, exprType msg) {
super(token);
this.test = test;
+ addChild(test);
this.msg = msg;
+ addChild(msg);
}
public Assert(int ttype, Token token, exprType test, exprType msg) {
super(ttype, token);
this.test = test;
+ addChild(test);
this.msg = msg;
+ addChild(msg);
}
public Assert(PythonTree tree, exprType test, exprType msg) {
super(tree);
this.test = test;
+ addChild(test);
this.msg = msg;
+ addChild(msg);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Assign.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Assign.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -21,6 +21,7 @@
}
}
this.value = value;
+ addChild(value);
}
public Assign(int ttype, Token token, exprType[] targets, exprType value) {
@@ -32,6 +33,7 @@
}
}
this.value = value;
+ addChild(value);
}
public Assign(PythonTree tree, exprType[] targets, exprType value) {
@@ -43,6 +45,7 @@
}
}
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Attribute.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Attribute.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,6 +17,7 @@
ctx) {
super(token);
this.value = value;
+ addChild(value);
this.attr = attr;
this.ctx = ctx;
}
@@ -25,6 +26,7 @@
expr_contextType ctx) {
super(ttype, token);
this.value = value;
+ addChild(value);
this.attr = attr;
this.ctx = ctx;
}
@@ -33,6 +35,7 @@
expr_contextType ctx) {
super(tree);
this.value = value;
+ addChild(value);
this.attr = attr;
this.ctx = ctx;
}
Modified: branches/nowalker/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/AugAssign.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/AugAssign.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,24 +17,30 @@
value) {
super(token);
this.target = target;
+ addChild(target);
this.op = op;
this.value = value;
+ addChild(value);
}
public AugAssign(int ttype, Token token, exprType target, operatorType op,
exprType value) {
super(ttype, token);
this.target = target;
+ addChild(target);
this.op = op;
this.value = value;
+ addChild(value);
}
public AugAssign(PythonTree tree, exprType target, operatorType op,
exprType value) {
super(tree);
this.target = target;
+ addChild(target);
this.op = op;
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/BinOp.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/BinOp.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,28 +17,33 @@
super(token);
}
-
public BinOp(Token token, exprType left, operatorType op, exprType right) {
super(token);
this.left = left;
+ addChild(left);
this.op = op;
this.right = right;
+ addChild(right);
}
public BinOp(int ttype, Token token, exprType left, operatorType op,
exprType right) {
super(ttype, token);
this.left = left;
+ addChild(left);
this.op = op;
this.right = right;
+ addChild(right);
}
public BinOp(PythonTree tree, exprType left, operatorType op, exprType
right) {
super(tree);
this.left = left;
+ addChild(left);
this.op = op;
this.right = right;
+ addChild(right);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Call.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Call.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -20,6 +20,7 @@
keywords, exprType starargs, exprType kwargs) {
super(token);
this.func = func;
+ addChild(func);
this.args = args;
if (args != null) {
for(int iargs=0;iargs<args.length;iargs++) {
@@ -33,13 +34,16 @@
}
}
this.starargs = starargs;
+ addChild(starargs);
this.kwargs = kwargs;
+ addChild(kwargs);
}
public Call(int ttype, Token token, exprType func, exprType[] args,
keywordType[] keywords, exprType starargs, exprType kwargs) {
super(ttype, token);
this.func = func;
+ addChild(func);
this.args = args;
if (args != null) {
for(int iargs=0;iargs<args.length;iargs++) {
@@ -53,13 +57,16 @@
}
}
this.starargs = starargs;
+ addChild(starargs);
this.kwargs = kwargs;
+ addChild(kwargs);
}
public Call(PythonTree tree, exprType func, exprType[] args, keywordType[]
keywords, exprType starargs, exprType kwargs) {
super(tree);
this.func = func;
+ addChild(func);
this.args = args;
if (args != null) {
for(int iargs=0;iargs<args.length;iargs++) {
@@ -73,7 +80,9 @@
}
}
this.starargs = starargs;
+ addChild(starargs);
this.kwargs = kwargs;
+ addChild(kwargs);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Compare.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Compare.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -18,6 +18,7 @@
comparators) {
super(token);
this.left = left;
+ addChild(left);
this.ops = ops;
this.comparators = comparators;
if (comparators != null) {
@@ -32,6 +33,7 @@
exprType[] comparators) {
super(ttype, token);
this.left = left;
+ addChild(left);
this.ops = ops;
this.comparators = comparators;
if (comparators != null) {
@@ -46,6 +48,7 @@
comparators) {
super(tree);
this.left = left;
+ addChild(left);
this.ops = ops;
this.comparators = comparators;
if (comparators != null) {
Modified: branches/nowalker/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Exec.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Exec.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,24 +17,33 @@
public Exec(Token token, exprType body, exprType globals, exprType locals) {
super(token);
this.body = body;
+ addChild(body);
this.globals = globals;
+ addChild(globals);
this.locals = locals;
+ addChild(locals);
}
public Exec(int ttype, Token token, exprType body, exprType globals,
exprType locals) {
super(ttype, token);
this.body = body;
+ addChild(body);
this.globals = globals;
+ addChild(globals);
this.locals = locals;
+ addChild(locals);
}
public Exec(PythonTree tree, exprType body, exprType globals, exprType
locals) {
super(tree);
this.body = body;
+ addChild(body);
this.globals = globals;
+ addChild(globals);
this.locals = locals;
+ addChild(locals);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Expr.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Expr.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Expr(Token token, exprType value) {
super(token);
this.value = value;
+ addChild(value);
}
public Expr(int ttype, Token token, exprType value) {
super(ttype, token);
this.value = value;
+ addChild(value);
}
public Expr(PythonTree tree, exprType value) {
super(tree);
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Expression.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Expression.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Expression(Token token, exprType body) {
super(token);
this.body = body;
+ addChild(body);
}
public Expression(int ttype, Token token, exprType body) {
super(ttype, token);
this.body = body;
+ addChild(body);
}
public Expression(PythonTree tree, exprType body) {
super(tree);
this.body = body;
+ addChild(body);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/For.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/For.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/For.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -19,7 +19,9 @@
stmtType[] orelse) {
super(token);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -38,7 +40,9 @@
stmtType[] body, stmtType[] orelse) {
super(ttype, token);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -57,7 +61,9 @@
body, stmtType[] orelse) {
super(tree);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
Modified: branches/nowalker/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/GeneratorExp.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/GeneratorExp.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,6 +16,7 @@
generators) {
super(token);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
@@ -28,6 +29,7 @@
comprehensionType[] generators) {
super(ttype, token);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
@@ -40,6 +42,7 @@
generators) {
super(tree);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
Modified: branches/nowalker/src/org/python/antlr/ast/If.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/If.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/If.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,6 +17,7 @@
public If(Token token, exprType test, stmtType[] body, stmtType[] orelse) {
super(token);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -35,6 +36,7 @@
stmtType[] orelse) {
super(ttype, token);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -53,6 +55,7 @@
orelse) {
super(tree);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
Modified: branches/nowalker/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/IfExp.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/IfExp.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,24 +17,33 @@
public IfExp(Token token, exprType test, exprType body, exprType orelse) {
super(token);
this.test = test;
+ addChild(test);
this.body = body;
+ addChild(body);
this.orelse = orelse;
+ addChild(orelse);
}
public IfExp(int ttype, Token token, exprType test, exprType body, exprType
orelse) {
super(ttype, token);
this.test = test;
+ addChild(test);
this.body = body;
+ addChild(body);
this.orelse = orelse;
+ addChild(orelse);
}
public IfExp(PythonTree tree, exprType test, exprType body, exprType
orelse) {
super(tree);
this.test = test;
+ addChild(test);
this.body = body;
+ addChild(body);
this.orelse = orelse;
+ addChild(orelse);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Index.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Index.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Index.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Index(Token token, exprType value) {
super(token);
this.value = value;
+ addChild(value);
}
public Index(int ttype, Token token, exprType value) {
super(ttype, token);
this.value = value;
+ addChild(value);
}
public Index(PythonTree tree, exprType value) {
super(tree);
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Lambda.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Lambda.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,18 +16,21 @@
super(token);
this.args = args;
this.body = body;
+ addChild(body);
}
public Lambda(int ttype, Token token, argumentsType args, exprType body) {
super(ttype, token);
this.args = args;
this.body = body;
+ addChild(body);
}
public Lambda(PythonTree tree, argumentsType args, exprType body) {
super(tree);
this.args = args;
this.body = body;
+ addChild(body);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/ListComp.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/ListComp.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -15,6 +15,7 @@
public ListComp(Token token, exprType elt, comprehensionType[] generators) {
super(token);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
@@ -27,6 +28,7 @@
generators) {
super(ttype, token);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
@@ -39,6 +41,7 @@
generators) {
super(tree);
this.elt = elt;
+ addChild(elt);
this.generators = generators;
if (generators != null) {
for(int igenerators=0;igenerators<generators.length;igenerators++) {
Modified: branches/nowalker/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Print.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Print.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,6 +16,7 @@
public Print(Token token, exprType dest, exprType[] values, boolean nl) {
super(token);
this.dest = dest;
+ addChild(dest);
this.values = values;
if (values != null) {
for(int ivalues=0;ivalues<values.length;ivalues++) {
@@ -29,6 +30,7 @@
boolean nl) {
super(ttype, token);
this.dest = dest;
+ addChild(dest);
this.values = values;
if (values != null) {
for(int ivalues=0;ivalues<values.length;ivalues++) {
@@ -42,6 +44,7 @@
{
super(tree);
this.dest = dest;
+ addChild(dest);
this.values = values;
if (values != null) {
for(int ivalues=0;ivalues<values.length;ivalues++) {
Modified: branches/nowalker/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Raise.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Raise.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,24 +16,33 @@
public Raise(Token token, exprType type, exprType inst, exprType tback) {
super(token);
this.type = type;
+ addChild(type);
this.inst = inst;
+ addChild(inst);
this.tback = tback;
+ addChild(tback);
}
public Raise(int ttype, Token token, exprType type, exprType inst, exprType
tback) {
super(ttype, token);
this.type = type;
+ addChild(type);
this.inst = inst;
+ addChild(inst);
this.tback = tback;
+ addChild(tback);
}
public Raise(PythonTree tree, exprType type, exprType inst, exprType tback)
{
super(tree);
this.type = type;
+ addChild(type);
this.inst = inst;
+ addChild(inst);
this.tback = tback;
+ addChild(tback);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Repr.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Repr.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Repr(Token token, exprType value) {
super(token);
this.value = value;
+ addChild(value);
}
public Repr(int ttype, Token token, exprType value) {
super(ttype, token);
this.value = value;
+ addChild(value);
}
public Repr(PythonTree tree, exprType value) {
super(tree);
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Return.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Return.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Return.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Return(Token token, exprType value) {
super(token);
this.value = value;
+ addChild(value);
}
public Return(int ttype, Token token, exprType value) {
super(ttype, token);
this.value = value;
+ addChild(value);
}
public Return(PythonTree tree, exprType value) {
super(tree);
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Slice.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Slice.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Slice.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,24 +17,33 @@
public Slice(Token token, exprType lower, exprType upper, exprType step) {
super(token);
this.lower = lower;
+ addChild(lower);
this.upper = upper;
+ addChild(upper);
this.step = step;
+ addChild(step);
}
public Slice(int ttype, Token token, exprType lower, exprType upper,
exprType step) {
super(ttype, token);
this.lower = lower;
+ addChild(lower);
this.upper = upper;
+ addChild(upper);
this.step = step;
+ addChild(step);
}
public Slice(PythonTree tree, exprType lower, exprType upper, exprType
step) {
super(tree);
this.lower = lower;
+ addChild(lower);
this.upper = upper;
+ addChild(upper);
this.step = step;
+ addChild(step);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/Subscript.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Subscript.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Subscript.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,6 +17,7 @@
expr_contextType ctx) {
super(token);
this.value = value;
+ addChild(value);
this.slice = slice;
this.ctx = ctx;
}
@@ -25,6 +26,7 @@
expr_contextType ctx) {
super(ttype, token);
this.value = value;
+ addChild(value);
this.slice = slice;
this.ctx = ctx;
}
@@ -33,6 +35,7 @@
expr_contextType ctx) {
super(tree);
this.value = value;
+ addChild(value);
this.slice = slice;
this.ctx = ctx;
}
Modified: branches/nowalker/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/UnaryOp.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/UnaryOp.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,18 +16,21 @@
super(token);
this.op = op;
this.operand = operand;
+ addChild(operand);
}
public UnaryOp(int ttype, Token token, unaryopType op, exprType operand) {
super(ttype, token);
this.op = op;
this.operand = operand;
+ addChild(operand);
}
public UnaryOp(PythonTree tree, unaryopType op, exprType operand) {
super(tree);
this.op = op;
this.operand = operand;
+ addChild(operand);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/While.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/While.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/While.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -18,6 +18,7 @@
orelse) {
super(token);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -36,6 +37,7 @@
stmtType[] orelse) {
super(ttype, token);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -54,6 +56,7 @@
orelse) {
super(tree);
this.test = test;
+ addChild(test);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
Modified: branches/nowalker/src/org/python/antlr/ast/With.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/With.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/With.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -18,7 +18,9 @@
stmtType[] body) {
super(token);
this.context_expr = context_expr;
+ addChild(context_expr);
this.optional_vars = optional_vars;
+ addChild(optional_vars);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -31,7 +33,9 @@
optional_vars, stmtType[] body) {
super(ttype, token);
this.context_expr = context_expr;
+ addChild(context_expr);
this.optional_vars = optional_vars;
+ addChild(optional_vars);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -44,7 +48,9 @@
stmtType[] body) {
super(tree);
this.context_expr = context_expr;
+ addChild(context_expr);
this.optional_vars = optional_vars;
+ addChild(optional_vars);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
Modified: branches/nowalker/src/org/python/antlr/ast/Yield.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/Yield.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/Yield.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -14,16 +14,19 @@
public Yield(Token token, exprType value) {
super(token);
this.value = value;
+ addChild(value);
}
public Yield(int ttype, Token token, exprType value) {
super(ttype, token);
this.value = value;
+ addChild(value);
}
public Yield(PythonTree tree, exprType value) {
super(tree);
this.value = value;
+ addChild(value);
}
public String toString() {
Modified: branches/nowalker/src/org/python/antlr/ast/comprehensionType.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/comprehensionType.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/comprehensionType.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -17,7 +17,9 @@
exprType[] ifs) {
super(token);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.ifs = ifs;
if (ifs != null) {
for(int iifs=0;iifs<ifs.length;iifs++) {
@@ -30,7 +32,9 @@
iter, exprType[] ifs) {
super(ttype, token);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.ifs = ifs;
if (ifs != null) {
for(int iifs=0;iifs<ifs.length;iifs++) {
@@ -43,7 +47,9 @@
exprType[] ifs) {
super(tree);
this.target = target;
+ addChild(target);
this.iter = iter;
+ addChild(iter);
this.ifs = ifs;
if (ifs != null) {
for(int iifs=0;iifs<ifs.length;iifs++) {
Modified: branches/nowalker/src/org/python/antlr/ast/excepthandlerType.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/excepthandlerType.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/excepthandlerType.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -20,7 +20,9 @@
stmtType[] body, int lineno, int col_offset) {
super(token);
this.type = type;
+ addChild(type);
this.name = name;
+ addChild(name);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -35,7 +37,9 @@
name, stmtType[] body, int lineno, int col_offset) {
super(ttype, token);
this.type = type;
+ addChild(type);
this.name = name;
+ addChild(name);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
@@ -50,7 +54,9 @@
stmtType[] body, int lineno, int col_offset) {
super(tree);
this.type = type;
+ addChild(type);
this.name = name;
+ addChild(name);
this.body = body;
if (body != null) {
for(int ibody=0;ibody<body.length;ibody++) {
Modified: branches/nowalker/src/org/python/antlr/ast/keywordType.java
===================================================================
--- branches/nowalker/src/org/python/antlr/ast/keywordType.java 2008-08-22 23:03:45 UTC (rev 5236)
+++ branches/nowalker/src/org/python/antlr/ast/keywordType.java 2008-08-23 02:33:48 UTC (rev 5237)
@@ -16,18 +16,21 @@
super(token);
this.arg = arg;
this.value = value;
+ addChild(value);
}
public keywordType(int ttype, Token token, String arg, exprType value) {
super(ttype, token);
this.arg = arg;
this.value = value;
+ addChild(value);
}
public keywordType(PythonTree tree, String arg, exprType value) {
super(tree);
this.arg = arg;
this.value = value;
+ addChild(value);
}
public String toString() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
