Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[4974] branches/asm
|
From: <fwi...@us...> - 2008-07-19 22:55:51
|
Revision: 4974
http://jython.svn.sourceforge.net/jython/?rev=4974&view=rev
Author: fwierzbicki
Date: 2008-07-19 22:48:21 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
Make PythonTree's toStringTree more easily comparable with ast/astview.py
output. This will help with the walkerless Python.g, as it doesn't quite
parse ast/astview.py yet.
Modified Paths:
--------------
branches/asm/ast/asdl_antlr.py
branches/asm/src/org/python/antlr/PythonTree.java
branches/asm/src/org/python/antlr/ast/Assert.java
branches/asm/src/org/python/antlr/ast/Assign.java
branches/asm/src/org/python/antlr/ast/Attribute.java
branches/asm/src/org/python/antlr/ast/AugAssign.java
branches/asm/src/org/python/antlr/ast/BinOp.java
branches/asm/src/org/python/antlr/ast/BoolOp.java
branches/asm/src/org/python/antlr/ast/Break.java
branches/asm/src/org/python/antlr/ast/Call.java
branches/asm/src/org/python/antlr/ast/ClassDef.java
branches/asm/src/org/python/antlr/ast/Compare.java
branches/asm/src/org/python/antlr/ast/Continue.java
branches/asm/src/org/python/antlr/ast/Delete.java
branches/asm/src/org/python/antlr/ast/Dict.java
branches/asm/src/org/python/antlr/ast/Ellipsis.java
branches/asm/src/org/python/antlr/ast/Exec.java
branches/asm/src/org/python/antlr/ast/Expr.java
branches/asm/src/org/python/antlr/ast/Expression.java
branches/asm/src/org/python/antlr/ast/ExtSlice.java
branches/asm/src/org/python/antlr/ast/For.java
branches/asm/src/org/python/antlr/ast/FunctionDef.java
branches/asm/src/org/python/antlr/ast/GeneratorExp.java
branches/asm/src/org/python/antlr/ast/Global.java
branches/asm/src/org/python/antlr/ast/If.java
branches/asm/src/org/python/antlr/ast/IfExp.java
branches/asm/src/org/python/antlr/ast/Import.java
branches/asm/src/org/python/antlr/ast/ImportFrom.java
branches/asm/src/org/python/antlr/ast/Index.java
branches/asm/src/org/python/antlr/ast/Interactive.java
branches/asm/src/org/python/antlr/ast/Lambda.java
branches/asm/src/org/python/antlr/ast/List.java
branches/asm/src/org/python/antlr/ast/ListComp.java
branches/asm/src/org/python/antlr/ast/Module.java
branches/asm/src/org/python/antlr/ast/Name.java
branches/asm/src/org/python/antlr/ast/Num.java
branches/asm/src/org/python/antlr/ast/Pass.java
branches/asm/src/org/python/antlr/ast/Print.java
branches/asm/src/org/python/antlr/ast/Raise.java
branches/asm/src/org/python/antlr/ast/Repr.java
branches/asm/src/org/python/antlr/ast/Return.java
branches/asm/src/org/python/antlr/ast/Slice.java
branches/asm/src/org/python/antlr/ast/Str.java
branches/asm/src/org/python/antlr/ast/Subscript.java
branches/asm/src/org/python/antlr/ast/Suite.java
branches/asm/src/org/python/antlr/ast/TryExcept.java
branches/asm/src/org/python/antlr/ast/TryFinally.java
branches/asm/src/org/python/antlr/ast/Tuple.java
branches/asm/src/org/python/antlr/ast/UnaryOp.java
branches/asm/src/org/python/antlr/ast/Unicode.java
branches/asm/src/org/python/antlr/ast/While.java
branches/asm/src/org/python/antlr/ast/With.java
branches/asm/src/org/python/antlr/ast/Yield.java
branches/asm/src/org/python/antlr/ast/aliasType.java
branches/asm/src/org/python/antlr/ast/argumentsType.java
branches/asm/src/org/python/antlr/ast/comprehensionType.java
branches/asm/src/org/python/antlr/ast/excepthandlerType.java
branches/asm/src/org/python/antlr/ast/keywordType.java
Modified: branches/asm/ast/asdl_antlr.py
===================================================================
--- branches/asm/ast/asdl_antlr.py 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/ast/asdl_antlr.py 2008-07-19 22:48:21 UTC (rev 4974)
@@ -308,12 +308,13 @@
# The toStringTree() method
self.emit("public String toStringTree() {", depth)
- self.emit('StringBuffer sb = new StringBuffer("%s[");' % clsname,
+ self.emit('StringBuffer sb = new StringBuffer("%s(");' % clsname,
depth+1)
for f in fields:
self.emit('sb.append("%s=");' % f.name, depth+1)
- self.emit("sb.append(this.%s);" % f.name, depth+1)
- self.emit('sb.append("]");', depth+1)
+ self.emit("sb.append(dumpThis(%s));" % f.name, depth+1)
+ self.emit('sb.append(",");', depth+1)
+ self.emit('sb.append(")");', depth+1)
self.emit("return sb.toString();", depth+1)
self.emit("}", depth)
self.emit("", 0)
Modified: branches/asm/src/org/python/antlr/PythonTree.java
===================================================================
--- branches/asm/src/org/python/antlr/PythonTree.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/PythonTree.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -83,13 +83,12 @@
public String toStringTree() {
if (children == null || children.size() == 0) {
- // System.out.println("Where are my children? -- asks " + token.getText());
- return this.toString() + "[" + this.info() + "]";
+ return this.toString();// + "[" + this.info() + "]";
}
StringBuffer buf = new StringBuffer();
if (!isNil()) {
buf.append("(");
- buf.append(this.toString() + "[" + this.info() + "]");
+ buf.append(this.toString());// + "[" + this.info() + "]");
buf.append(' ');
}
for (int i = 0; children != null && i < children.size(); i++) {
@@ -105,6 +104,34 @@
return buf.toString();
}
+ protected String dumpThis(String s) {
+ return s;
+ }
+
+ protected String dumpThis(Object o) {
+ if (o instanceof PythonTree) {
+ return ((PythonTree)o).toStringTree();
+ }
+ return String.valueOf(o);
+ }
+
+ protected String dumpThis(Object[] s) {
+ StringBuffer sb = new StringBuffer();
+ if (s == null) {
+ sb.append("null");
+ } else {
+ sb.append("(");
+ for (int i = 0; i < s.length; i++) {
+ if (i > 0)
+ sb.append(", ");
+ sb.append(dumpThis(s[i]));
+ }
+ sb.append(")");
+ }
+
+ return sb.toString();
+ }
+
public <R> R accept(VisitorIF<R> visitor) throws Exception {
throw new RuntimeException("Unexpected node: " + this);
}
Modified: branches/asm/src/org/python/antlr/ast/Assert.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Assert.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Assert.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Assert[");
+ StringBuffer sb = new StringBuffer("Assert(");
sb.append("test=");
- sb.append(this.test);
+ sb.append(dumpThis(test));
+ sb.append(",");
sb.append("msg=");
- sb.append(this.msg);
- sb.append("]");
+ sb.append(dumpThis(msg));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Assign.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Assign.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Assign.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -50,12 +50,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Assign[");
+ StringBuffer sb = new StringBuffer("Assign(");
sb.append("targets=");
- sb.append(this.targets);
+ sb.append(dumpThis(targets));
+ sb.append(",");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Attribute.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Attribute.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Attribute.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Attribute[");
+ StringBuffer sb = new StringBuffer("Attribute(");
sb.append("value=");
- sb.append(this.value);
+ sb.append(dumpThis(value));
+ sb.append(",");
sb.append("attr=");
- sb.append(this.attr);
+ sb.append(dumpThis(attr));
+ sb.append(",");
sb.append("ctx=");
- sb.append(this.ctx);
- sb.append("]");
+ sb.append(dumpThis(ctx));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/AugAssign.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/AugAssign.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("AugAssign[");
+ StringBuffer sb = new StringBuffer("AugAssign(");
sb.append("target=");
- sb.append(this.target);
+ sb.append(dumpThis(target));
+ sb.append(",");
sb.append("op=");
- sb.append(this.op);
+ sb.append(dumpThis(op));
+ sb.append(",");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/BinOp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/BinOp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/BinOp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -41,14 +41,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("BinOp[");
+ StringBuffer sb = new StringBuffer("BinOp(");
sb.append("left=");
- sb.append(this.left);
+ sb.append(dumpThis(left));
+ sb.append(",");
sb.append("op=");
- sb.append(this.op);
+ sb.append(dumpThis(op));
+ sb.append(",");
sb.append("right=");
- sb.append(this.right);
- sb.append("]");
+ sb.append(dumpThis(right));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/BoolOp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/BoolOp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -50,12 +50,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("BoolOp[");
+ StringBuffer sb = new StringBuffer("BoolOp(");
sb.append("op=");
- sb.append(this.op);
+ sb.append(dumpThis(op));
+ sb.append(",");
sb.append("values=");
- sb.append(this.values);
- sb.append("]");
+ sb.append(dumpThis(values));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Break.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Break.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Break.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -27,8 +27,8 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Break[");
- sb.append("]");
+ StringBuffer sb = new StringBuffer("Break(");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Call.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Call.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Call.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -81,18 +81,23 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Call[");
+ StringBuffer sb = new StringBuffer("Call(");
sb.append("func=");
- sb.append(this.func);
+ sb.append(dumpThis(func));
+ sb.append(",");
sb.append("args=");
- sb.append(this.args);
+ sb.append(dumpThis(args));
+ sb.append(",");
sb.append("keywords=");
- sb.append(this.keywords);
+ sb.append(dumpThis(keywords));
+ sb.append(",");
sb.append("starargs=");
- sb.append(this.starargs);
+ sb.append(dumpThis(starargs));
+ sb.append(",");
sb.append("kwargs=");
- sb.append(this.kwargs);
- sb.append("]");
+ sb.append(dumpThis(kwargs));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ClassDef.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/ClassDef.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -72,14 +72,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("ClassDef[");
+ StringBuffer sb = new StringBuffer("ClassDef(");
sb.append("name=");
- sb.append(this.name);
+ sb.append(dumpThis(name));
+ sb.append(",");
sb.append("bases=");
- sb.append(this.bases);
+ sb.append(dumpThis(bases));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Compare.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Compare.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Compare.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -61,14 +61,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Compare[");
+ StringBuffer sb = new StringBuffer("Compare(");
sb.append("left=");
- sb.append(this.left);
+ sb.append(dumpThis(left));
+ sb.append(",");
sb.append("ops=");
- sb.append(this.ops);
+ sb.append(dumpThis(ops));
+ sb.append(",");
sb.append("comparators=");
- sb.append(this.comparators);
- sb.append("]");
+ sb.append(dumpThis(comparators));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Continue.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Continue.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Continue.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -27,8 +27,8 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Continue[");
- sb.append("]");
+ StringBuffer sb = new StringBuffer("Continue(");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Delete.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Delete.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Delete.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Delete[");
+ StringBuffer sb = new StringBuffer("Delete(");
sb.append("targets=");
- sb.append(this.targets);
- sb.append("]");
+ sb.append(dumpThis(targets));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Dict.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Dict.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Dict.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -65,12 +65,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Dict[");
+ StringBuffer sb = new StringBuffer("Dict(");
sb.append("keys=");
- sb.append(this.keys);
+ sb.append(dumpThis(keys));
+ sb.append(",");
sb.append("values=");
- sb.append(this.values);
- sb.append("]");
+ sb.append(dumpThis(values));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Ellipsis.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Ellipsis.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -27,8 +27,8 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Ellipsis[");
- sb.append("]");
+ StringBuffer sb = new StringBuffer("Ellipsis(");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Exec.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Exec.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Exec.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Exec[");
+ StringBuffer sb = new StringBuffer("Exec(");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("globals=");
- sb.append(this.globals);
+ sb.append(dumpThis(globals));
+ sb.append(",");
sb.append("locals=");
- sb.append(this.locals);
- sb.append("]");
+ sb.append(dumpThis(locals));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Expr.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Expr.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Expr.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Expr[");
+ StringBuffer sb = new StringBuffer("Expr(");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Expression.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Expression.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Expression.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Expression[");
+ StringBuffer sb = new StringBuffer("Expression(");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ExtSlice.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/ExtSlice.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("ExtSlice[");
+ StringBuffer sb = new StringBuffer("ExtSlice(");
sb.append("dims=");
- sb.append(this.dims);
- sb.append("]");
+ sb.append(dumpThis(dims));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/For.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/For.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/For.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -77,16 +77,20 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("For[");
+ StringBuffer sb = new StringBuffer("For(");
sb.append("target=");
- sb.append(this.target);
+ sb.append(dumpThis(target));
+ sb.append(",");
sb.append("iter=");
- sb.append(this.iter);
+ sb.append(dumpThis(iter));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("orelse=");
- sb.append(this.orelse);
- sb.append("]");
+ sb.append(dumpThis(orelse));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/FunctionDef.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/FunctionDef.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -77,16 +77,20 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("FunctionDef[");
+ StringBuffer sb = new StringBuffer("FunctionDef(");
sb.append("name=");
- sb.append(this.name);
+ sb.append(dumpThis(name));
+ sb.append(",");
sb.append("args=");
- sb.append(this.args);
+ sb.append(dumpThis(args));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("decorators=");
- sb.append(this.decorators);
- sb.append("]");
+ sb.append(dumpThis(decorators));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/GeneratorExp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/GeneratorExp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -53,12 +53,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("GeneratorExp[");
+ StringBuffer sb = new StringBuffer("GeneratorExp(");
sb.append("elt=");
- sb.append(this.elt);
+ sb.append(dumpThis(elt));
+ sb.append(",");
sb.append("generators=");
- sb.append(this.generators);
- sb.append("]");
+ sb.append(dumpThis(generators));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Global.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Global.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Global.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Global[");
+ StringBuffer sb = new StringBuffer("Global(");
sb.append("names=");
- sb.append(this.names);
- sb.append("]");
+ sb.append(dumpThis(names));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/If.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/If.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/If.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -72,14 +72,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("If[");
+ StringBuffer sb = new StringBuffer("If(");
sb.append("test=");
- sb.append(this.test);
+ sb.append(dumpThis(test));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("orelse=");
- sb.append(this.orelse);
- sb.append("]");
+ sb.append(dumpThis(orelse));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/IfExp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/IfExp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/IfExp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("IfExp[");
+ StringBuffer sb = new StringBuffer("IfExp(");
sb.append("test=");
- sb.append(this.test);
+ sb.append(dumpThis(test));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("orelse=");
- sb.append(this.orelse);
- sb.append("]");
+ sb.append(dumpThis(orelse));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Import.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Import.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Import.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Import[");
+ StringBuffer sb = new StringBuffer("Import(");
sb.append("names=");
- sb.append(this.names);
- sb.append("]");
+ sb.append(dumpThis(names));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ImportFrom.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/ImportFrom.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -58,14 +58,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("ImportFrom[");
+ StringBuffer sb = new StringBuffer("ImportFrom(");
sb.append("module=");
- sb.append(this.module);
+ sb.append(dumpThis(module));
+ sb.append(",");
sb.append("names=");
- sb.append(this.names);
+ sb.append(dumpThis(names));
+ sb.append(",");
sb.append("level=");
- sb.append(this.level);
- sb.append("]");
+ sb.append(dumpThis(level));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Index.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Index.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Index.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Index[");
+ StringBuffer sb = new StringBuffer("Index(");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Interactive.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Interactive.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Interactive.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Interactive[");
+ StringBuffer sb = new StringBuffer("Interactive(");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Lambda.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Lambda.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Lambda.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Lambda[");
+ StringBuffer sb = new StringBuffer("Lambda(");
sb.append("args=");
- sb.append(this.args);
+ sb.append(dumpThis(args));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/List.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/List.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/List.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -50,12 +50,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("List[");
+ StringBuffer sb = new StringBuffer("List(");
sb.append("elts=");
- sb.append(this.elts);
+ sb.append(dumpThis(elts));
+ sb.append(",");
sb.append("ctx=");
- sb.append(this.ctx);
- sb.append("]");
+ sb.append(dumpThis(ctx));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/ListComp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/ListComp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/ListComp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -52,12 +52,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("ListComp[");
+ StringBuffer sb = new StringBuffer("ListComp(");
sb.append("elt=");
- sb.append(this.elt);
+ sb.append(dumpThis(elt));
+ sb.append(",");
sb.append("generators=");
- sb.append(this.generators);
- sb.append("]");
+ sb.append(dumpThis(generators));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Module.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Module.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Module.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Module[");
+ StringBuffer sb = new StringBuffer("Module(");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Name.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Name.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Name.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Name[");
+ StringBuffer sb = new StringBuffer("Name(");
sb.append("id=");
- sb.append(this.id);
+ sb.append(dumpThis(id));
+ sb.append(",");
sb.append("ctx=");
- sb.append(this.ctx);
- sb.append("]");
+ sb.append(dumpThis(ctx));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Num.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Num.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Num.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Num[");
+ StringBuffer sb = new StringBuffer("Num(");
sb.append("n=");
- sb.append(this.n);
- sb.append("]");
+ sb.append(dumpThis(n));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Pass.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Pass.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Pass.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -27,8 +27,8 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Pass[");
- sb.append("]");
+ StringBuffer sb = new StringBuffer("Pass(");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Print.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Print.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Print.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -56,14 +56,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Print[");
+ StringBuffer sb = new StringBuffer("Print(");
sb.append("dest=");
- sb.append(this.dest);
+ sb.append(dumpThis(dest));
+ sb.append(",");
sb.append("values=");
- sb.append(this.values);
+ sb.append(dumpThis(values));
+ sb.append(",");
sb.append("nl=");
- sb.append(this.nl);
- sb.append("]");
+ sb.append(dumpThis(nl));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Raise.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Raise.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Raise.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -41,14 +41,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Raise[");
+ StringBuffer sb = new StringBuffer("Raise(");
sb.append("type=");
- sb.append(this.type);
+ sb.append(dumpThis(type));
+ sb.append(",");
sb.append("inst=");
- sb.append(this.inst);
+ sb.append(dumpThis(inst));
+ sb.append(",");
sb.append("tback=");
- sb.append(this.tback);
- sb.append("]");
+ sb.append(dumpThis(tback));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Repr.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Repr.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Repr.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Repr[");
+ StringBuffer sb = new StringBuffer("Repr(");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Return.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Return.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Return.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Return[");
+ StringBuffer sb = new StringBuffer("Return(");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Slice.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Slice.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Slice.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Slice[");
+ StringBuffer sb = new StringBuffer("Slice(");
sb.append("lower=");
- sb.append(this.lower);
+ sb.append(dumpThis(lower));
+ sb.append(",");
sb.append("upper=");
- sb.append(this.upper);
+ sb.append(dumpThis(upper));
+ sb.append(",");
sb.append("step=");
- sb.append(this.step);
- sb.append("]");
+ sb.append(dumpThis(step));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Str.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Str.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Str.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Str[");
+ StringBuffer sb = new StringBuffer("Str(");
sb.append("s=");
- sb.append(this.s);
- sb.append("]");
+ sb.append(dumpThis(s));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Subscript.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Subscript.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Subscript.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -42,14 +42,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Subscript[");
+ StringBuffer sb = new StringBuffer("Subscript(");
sb.append("value=");
- sb.append(this.value);
+ sb.append(dumpThis(value));
+ sb.append(",");
sb.append("slice=");
- sb.append(this.slice);
+ sb.append(dumpThis(slice));
+ sb.append(",");
sb.append("ctx=");
- sb.append(this.ctx);
- sb.append("]");
+ sb.append(dumpThis(ctx));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Suite.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Suite.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Suite.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -46,10 +46,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Suite[");
+ StringBuffer sb = new StringBuffer("Suite(");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/TryExcept.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/TryExcept.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -88,14 +88,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("TryExcept[");
+ StringBuffer sb = new StringBuffer("TryExcept(");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("handlers=");
- sb.append(this.handlers);
+ sb.append(dumpThis(handlers));
+ sb.append(",");
sb.append("orelse=");
- sb.append(this.orelse);
- sb.append("]");
+ sb.append(dumpThis(orelse));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/TryFinally.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/TryFinally.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -66,12 +66,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("TryFinally[");
+ StringBuffer sb = new StringBuffer("TryFinally(");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("finalbody=");
- sb.append(this.finalbody);
- sb.append("]");
+ sb.append(dumpThis(finalbody));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Tuple.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Tuple.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Tuple.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -51,12 +51,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Tuple[");
+ StringBuffer sb = new StringBuffer("Tuple(");
sb.append("elts=");
- sb.append(this.elts);
+ sb.append(dumpThis(elts));
+ sb.append(",");
sb.append("ctx=");
- sb.append(this.ctx);
- sb.append("]");
+ sb.append(dumpThis(ctx));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/UnaryOp.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/UnaryOp.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("UnaryOp[");
+ StringBuffer sb = new StringBuffer("UnaryOp(");
sb.append("op=");
- sb.append(this.op);
+ sb.append(dumpThis(op));
+ sb.append(",");
sb.append("operand=");
- sb.append(this.operand);
- sb.append("]");
+ sb.append(dumpThis(operand));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Unicode.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Unicode.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Unicode.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Unicode[");
+ StringBuffer sb = new StringBuffer("Unicode(");
sb.append("s=");
- sb.append(this.s);
- sb.append("]");
+ sb.append(dumpThis(s));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/While.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/While.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/While.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -73,14 +73,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("While[");
+ StringBuffer sb = new StringBuffer("While(");
sb.append("test=");
- sb.append(this.test);
+ sb.append(dumpThis(test));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("orelse=");
- sb.append(this.orelse);
- sb.append("]");
+ sb.append(dumpThis(orelse));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/With.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/With.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/With.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -58,14 +58,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("With[");
+ StringBuffer sb = new StringBuffer("With(");
sb.append("context_expr=");
- sb.append(this.context_expr);
+ sb.append(dumpThis(context_expr));
+ sb.append(",");
sb.append("optional_vars=");
- sb.append(this.optional_vars);
+ sb.append(dumpThis(optional_vars));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
- sb.append("]");
+ sb.append(dumpThis(body));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/Yield.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/Yield.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/Yield.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -31,10 +31,11 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("Yield[");
+ StringBuffer sb = new StringBuffer("Yield(");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/aliasType.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/aliasType.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/aliasType.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("alias[");
+ StringBuffer sb = new StringBuffer("alias(");
sb.append("name=");
- sb.append(this.name);
+ sb.append(dumpThis(name));
+ sb.append(",");
sb.append("asname=");
- sb.append(this.asname);
- sb.append("]");
+ sb.append(dumpThis(asname));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/argumentsType.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/argumentsType.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/argumentsType.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -77,16 +77,20 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("arguments[");
+ StringBuffer sb = new StringBuffer("arguments(");
sb.append("args=");
- sb.append(this.args);
+ sb.append(dumpThis(args));
+ sb.append(",");
sb.append("vararg=");
- sb.append(this.vararg);
+ sb.append(dumpThis(vararg));
+ sb.append(",");
sb.append("kwarg=");
- sb.append(this.kwarg);
+ sb.append(dumpThis(kwarg));
+ sb.append(",");
sb.append("defaults=");
- sb.append(this.defaults);
- sb.append("]");
+ sb.append(dumpThis(defaults));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/comprehensionType.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/comprehensionType.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/comprehensionType.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -57,14 +57,17 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("comprehension[");
+ StringBuffer sb = new StringBuffer("comprehension(");
sb.append("target=");
- sb.append(this.target);
+ sb.append(dumpThis(target));
+ sb.append(",");
sb.append("iter=");
- sb.append(this.iter);
+ sb.append(dumpThis(iter));
+ sb.append(",");
sb.append("ifs=");
- sb.append(this.ifs);
- sb.append("]");
+ sb.append(dumpThis(ifs));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/excepthandlerType.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/excepthandlerType.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/excepthandlerType.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -66,18 +66,23 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("excepthandler[");
+ StringBuffer sb = new StringBuffer("excepthandler(");
sb.append("type=");
- sb.append(this.type);
+ sb.append(dumpThis(type));
+ sb.append(",");
sb.append("name=");
- sb.append(this.name);
+ sb.append(dumpThis(name));
+ sb.append(",");
sb.append("body=");
- sb.append(this.body);
+ sb.append(dumpThis(body));
+ sb.append(",");
sb.append("lineno=");
- sb.append(this.lineno);
+ sb.append(dumpThis(lineno));
+ sb.append(",");
sb.append("col_offset=");
- sb.append(this.col_offset);
- sb.append("]");
+ sb.append(dumpThis(col_offset));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
Modified: branches/asm/src/org/python/antlr/ast/keywordType.java
===================================================================
--- branches/asm/src/org/python/antlr/ast/keywordType.java 2008-07-19 05:54:20 UTC (rev 4973)
+++ branches/asm/src/org/python/antlr/ast/keywordType.java 2008-07-19 22:48:21 UTC (rev 4974)
@@ -35,12 +35,14 @@
}
public String toStringTree() {
- StringBuffer sb = new StringBuffer("keyword[");
+ StringBuffer sb = new StringBuffer("keyword(");
sb.append("arg=");
- sb.append(this.arg);
+ sb.append(dumpThis(arg));
+ sb.append(",");
sb.append("value=");
- sb.append(this.value);
- sb.append("]");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
return sb.toString();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
