Menu
▾
▴
jython-checkins
|
From: <fwi...@us...> - 2008-09-15 16:57:07
|
Revision: 5333
http://jython.svn.sourceforge.net/jython/?rev=5333&view=rev
Author: fwierzbicki
Date: 2008-09-15 23:57:05 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
make accept and traverse no-ops for error nodes.
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/ast/ErrorExpr.java
trunk/jython/src/org/python/antlr/ast/ErrorMod.java
trunk/jython/src/org/python/antlr/ast/ErrorSlice.java
trunk/jython/src/org/python/antlr/ast/ErrorStmt.java
Modified: trunk/jython/src/org/python/antlr/ast/ErrorExpr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ErrorExpr.java 2008-09-15 22:54:07 UTC (rev 5332)
+++ trunk/jython/src/org/python/antlr/ast/ErrorExpr.java 2008-09-15 23:57:05 UTC (rev 5333)
@@ -25,4 +25,12 @@
return getCharPositionInLine();
}
+ public <R> R accept(VisitorIF<R> visitor) {
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ //no op.
+ }
+
}
Modified: trunk/jython/src/org/python/antlr/ast/ErrorMod.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ErrorMod.java 2008-09-15 22:54:07 UTC (rev 5332)
+++ trunk/jython/src/org/python/antlr/ast/ErrorMod.java 2008-09-15 23:57:05 UTC (rev 5333)
@@ -25,4 +25,12 @@
return getCharPositionInLine();
}
+ public <R> R accept(VisitorIF<R> visitor) {
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ //no op.
+ }
+
}
Modified: trunk/jython/src/org/python/antlr/ast/ErrorSlice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ErrorSlice.java 2008-09-15 22:54:07 UTC (rev 5332)
+++ trunk/jython/src/org/python/antlr/ast/ErrorSlice.java 2008-09-15 23:57:05 UTC (rev 5333)
@@ -29,4 +29,12 @@
return getCharPositionInLine();
}
+ public <R> R accept(VisitorIF<R> visitor) {
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ //no op.
+ }
+
}
Modified: trunk/jython/src/org/python/antlr/ast/ErrorStmt.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ErrorStmt.java 2008-09-15 22:54:07 UTC (rev 5332)
+++ trunk/jython/src/org/python/antlr/ast/ErrorStmt.java 2008-09-15 23:57:05 UTC (rev 5333)
@@ -29,4 +29,12 @@
return getCharPositionInLine();
}
+ public <R> R accept(VisitorIF<R> visitor) {
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ //no op.
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2008-12-05 01:11:50
|
Revision: 5696
http://jython.svn.sourceforge.net/jython/?rev=5696&view=rev
Author: fwierzbicki
Date: 2008-12-05 01:11:47 +0000 (Fri, 05 Dec 2008)
Log Message:
-----------
Ack missed these new files for the astwrite merge.
Added Paths:
-----------
trunk/jython/src/org/python/antlr/ast/alias.java
trunk/jython/src/org/python/antlr/ast/arguments.java
trunk/jython/src/org/python/antlr/ast/comprehension.java
trunk/jython/src/org/python/antlr/ast/keyword.java
Added: trunk/jython/src/org/python/antlr/ast/alias.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/alias.java (rev 0)
+++ trunk/jython/src/org/python/antlr/ast/alias.java 2008-12-05 01:11:47 UTC (rev 5696)
@@ -0,0 +1,132 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import org.python.antlr.AST;
+import org.python.antlr.PythonTree;
+import org.python.antlr.adapter.AstAdapters;
+import org.python.antlr.base.excepthandler;
+import org.python.antlr.base.expr;
+import org.python.antlr.base.mod;
+import org.python.antlr.base.slice;
+import org.python.antlr.base.stmt;
+import org.python.core.ArgParser;
+import org.python.core.AstList;
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedSet;
+import org.python.expose.ExposedType;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+@ExposedType(name = "_ast.alias", base = AST.class)
+public class alias extends PythonTree {
+ public static final PyType TYPE = PyType.fromClass(alias.class);
+ private String name;
+ public String getInternalName() {
+ return name;
+ }
+ @ExposedGet(name = "name")
+ public PyObject getName() {
+ if (name == null) return Py.None;
+ return new PyString(name);
+ }
+ @ExposedSet(name = "name")
+ public void setName(PyObject name) {
+ this.name = AstAdapters.py2identifier(name);
+ }
+
+ private String asname;
+ public String getInternalAsname() {
+ return asname;
+ }
+ @ExposedGet(name = "asname")
+ public PyObject getAsname() {
+ if (asname == null) return Py.None;
+ return new PyString(asname);
+ }
+ @ExposedSet(name = "asname")
+ public void setAsname(PyObject asname) {
+ this.asname = AstAdapters.py2identifier(asname);
+ }
+
+
+ private final static PyString[] fields =
+ new PyString[] {new PyString("name"), new PyString("asname")};
+ @ExposedGet(name = "_fields")
+ public PyString[] get_fields() { return fields; }
+
+ private final static PyString[] attributes = new PyString[0];
+ @ExposedGet(name = "_attributes")
+ public PyString[] get_attributes() { return attributes; }
+
+ public alias() {
+ this(TYPE);
+ }
+ public alias(PyType subType) {
+ super(subType);
+ }
+ @ExposedNew
+ @ExposedMethod
+ public void alias___init__(PyObject[] args, String[] keywords) {
+ ArgParser ap = new ArgParser("alias", args, keywords, new String[]
+ {"name", "asname"}, 2);
+ setName(ap.getPyObject(0));
+ setAsname(ap.getPyObject(1));
+ }
+
+ public alias(PyObject name, PyObject asname) {
+ setName(name);
+ setAsname(asname);
+ }
+
+ public alias(Token token, String name, String asname) {
+ super(token);
+ this.name = name;
+ this.asname = asname;
+ }
+
+ public alias(Integer ttype, Token token, String name, String asname) {
+ super(ttype, token);
+ this.name = name;
+ this.asname = asname;
+ }
+
+ public alias(PythonTree tree, String name, String asname) {
+ super(tree);
+ this.name = name;
+ this.asname = asname;
+ }
+
+ @ExposedGet(name = "repr")
+ public String toString() {
+ return "alias";
+ }
+
+ public String toStringTree() {
+ StringBuffer sb = new StringBuffer("alias(");
+ sb.append("name=");
+ sb.append(dumpThis(name));
+ sb.append(",");
+ sb.append("asname=");
+ sb.append(dumpThis(asname));
+ sb.append(",");
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public <R> R accept(VisitorIF<R> visitor) throws Exception {
+ traverse(visitor);
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ }
+
+}
Added: trunk/jython/src/org/python/antlr/ast/arguments.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/arguments.java (rev 0)
+++ trunk/jython/src/org/python/antlr/ast/arguments.java 2008-12-05 01:11:47 UTC (rev 5696)
@@ -0,0 +1,226 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import org.python.antlr.AST;
+import org.python.antlr.PythonTree;
+import org.python.antlr.adapter.AstAdapters;
+import org.python.antlr.base.excepthandler;
+import org.python.antlr.base.expr;
+import org.python.antlr.base.mod;
+import org.python.antlr.base.slice;
+import org.python.antlr.base.stmt;
+import org.python.core.ArgParser;
+import org.python.core.AstList;
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedSet;
+import org.python.expose.ExposedType;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+@ExposedType(name = "_ast.arguments", base = AST.class)
+public class arguments extends PythonTree {
+ public static final PyType TYPE = PyType.fromClass(arguments.class);
+ private java.util.List<expr> args;
+ public java.util.List<expr> getInternalArgs() {
+ return args;
+ }
+ @ExposedGet(name = "args")
+ public PyObject getArgs() {
+ return new AstList(args, AstAdapters.exprAdapter);
+ }
+ @ExposedSet(name = "args")
+ public void setArgs(PyObject args) {
+ this.args = AstAdapters.py2exprList(args);
+ }
+
+ private String vararg;
+ public String getInternalVararg() {
+ return vararg;
+ }
+ @ExposedGet(name = "vararg")
+ public PyObject getVararg() {
+ if (vararg == null) return Py.None;
+ return new PyString(vararg);
+ }
+ @ExposedSet(name = "vararg")
+ public void setVararg(PyObject vararg) {
+ this.vararg = AstAdapters.py2identifier(vararg);
+ }
+
+ private String kwarg;
+ public String getInternalKwarg() {
+ return kwarg;
+ }
+ @ExposedGet(name = "kwarg")
+ public PyObject getKwarg() {
+ if (kwarg == null) return Py.None;
+ return new PyString(kwarg);
+ }
+ @ExposedSet(name = "kwarg")
+ public void setKwarg(PyObject kwarg) {
+ this.kwarg = AstAdapters.py2identifier(kwarg);
+ }
+
+ private java.util.List<expr> defaults;
+ public java.util.List<expr> getInternalDefaults() {
+ return defaults;
+ }
+ @ExposedGet(name = "defaults")
+ public PyObject getDefaults() {
+ return new AstList(defaults, AstAdapters.exprAdapter);
+ }
+ @ExposedSet(name = "defaults")
+ public void setDefaults(PyObject defaults) {
+ this.defaults = AstAdapters.py2exprList(defaults);
+ }
+
+
+ private final static PyString[] fields =
+ new PyString[] {new PyString("args"), new PyString("vararg"), new PyString("kwarg"), new
+ PyString("defaults")};
+ @ExposedGet(name = "_fields")
+ public PyString[] get_fields() { return fields; }
+
+ private final static PyString[] attributes = new PyString[0];
+ @ExposedGet(name = "_attributes")
+ public PyString[] get_attributes() { return attributes; }
+
+ public arguments() {
+ this(TYPE);
+ }
+ public arguments(PyType subType) {
+ super(subType);
+ }
+ @ExposedNew
+ @ExposedMethod
+ public void arguments___init__(PyObject[] args, String[] keywords) {
+ ArgParser ap = new ArgParser("arguments", args, keywords, new String[]
+ {"args", "vararg", "kwarg", "defaults"}, 4);
+ setArgs(ap.getPyObject(0));
+ setVararg(ap.getPyObject(1));
+ setKwarg(ap.getPyObject(2));
+ setDefaults(ap.getPyObject(3));
+ }
+
+ public arguments(PyObject args, PyObject vararg, PyObject kwarg, PyObject defaults) {
+ setArgs(args);
+ setVararg(vararg);
+ setKwarg(kwarg);
+ setDefaults(defaults);
+ }
+
+ public arguments(Token token, java.util.List<expr> args, String vararg, String kwarg,
+ java.util.List<expr> defaults) {
+ super(token);
+ this.args = args;
+ if (args == null) {
+ this.args = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.args) {
+ addChild(t);
+ }
+ this.vararg = vararg;
+ this.kwarg = kwarg;
+ this.defaults = defaults;
+ if (defaults == null) {
+ this.defaults = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.defaults) {
+ addChild(t);
+ }
+ }
+
+ public arguments(Integer ttype, Token token, java.util.List<expr> args, String vararg, String
+ kwarg, java.util.List<expr> defaults) {
+ super(ttype, token);
+ this.args = args;
+ if (args == null) {
+ this.args = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.args) {
+ addChild(t);
+ }
+ this.vararg = vararg;
+ this.kwarg = kwarg;
+ this.defaults = defaults;
+ if (defaults == null) {
+ this.defaults = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.defaults) {
+ addChild(t);
+ }
+ }
+
+ public arguments(PythonTree tree, java.util.List<expr> args, String vararg, String kwarg,
+ java.util.List<expr> defaults) {
+ super(tree);
+ this.args = args;
+ if (args == null) {
+ this.args = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.args) {
+ addChild(t);
+ }
+ this.vararg = vararg;
+ this.kwarg = kwarg;
+ this.defaults = defaults;
+ if (defaults == null) {
+ this.defaults = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.defaults) {
+ addChild(t);
+ }
+ }
+
+ @ExposedGet(name = "repr")
+ public String toString() {
+ return "arguments";
+ }
+
+ public String toStringTree() {
+ StringBuffer sb = new StringBuffer("arguments(");
+ sb.append("args=");
+ sb.append(dumpThis(args));
+ sb.append(",");
+ sb.append("vararg=");
+ sb.append(dumpThis(vararg));
+ sb.append(",");
+ sb.append("kwarg=");
+ sb.append(dumpThis(kwarg));
+ sb.append(",");
+ sb.append("defaults=");
+ sb.append(dumpThis(defaults));
+ sb.append(",");
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public <R> R accept(VisitorIF<R> visitor) throws Exception {
+ traverse(visitor);
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ if (args != null) {
+ for (PythonTree t : args) {
+ if (t != null)
+ t.accept(visitor);
+ }
+ }
+ if (defaults != null) {
+ for (PythonTree t : defaults) {
+ if (t != null)
+ t.accept(visitor);
+ }
+ }
+ }
+
+}
Added: trunk/jython/src/org/python/antlr/ast/comprehension.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/comprehension.java (rev 0)
+++ trunk/jython/src/org/python/antlr/ast/comprehension.java 2008-12-05 01:11:47 UTC (rev 5696)
@@ -0,0 +1,186 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import org.python.antlr.AST;
+import org.python.antlr.PythonTree;
+import org.python.antlr.adapter.AstAdapters;
+import org.python.antlr.base.excepthandler;
+import org.python.antlr.base.expr;
+import org.python.antlr.base.mod;
+import org.python.antlr.base.slice;
+import org.python.antlr.base.stmt;
+import org.python.core.ArgParser;
+import org.python.core.AstList;
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedSet;
+import org.python.expose.ExposedType;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+@ExposedType(name = "_ast.comprehension", base = AST.class)
+public class comprehension extends PythonTree {
+ public static final PyType TYPE = PyType.fromClass(comprehension.class);
+ private expr target;
+ public expr getInternalTarget() {
+ return target;
+ }
+ @ExposedGet(name = "target")
+ public PyObject getTarget() {
+ return target;
+ }
+ @ExposedSet(name = "target")
+ public void setTarget(PyObject target) {
+ this.target = AstAdapters.py2expr(target);
+ }
+
+ private expr iter;
+ public expr getInternalIter() {
+ return iter;
+ }
+ @ExposedGet(name = "iter")
+ public PyObject getIter() {
+ return iter;
+ }
+ @ExposedSet(name = "iter")
+ public void setIter(PyObject iter) {
+ this.iter = AstAdapters.py2expr(iter);
+ }
+
+ private java.util.List<expr> ifs;
+ public java.util.List<expr> getInternalIfs() {
+ return ifs;
+ }
+ @ExposedGet(name = "ifs")
+ public PyObject getIfs() {
+ return new AstList(ifs, AstAdapters.exprAdapter);
+ }
+ @ExposedSet(name = "ifs")
+ public void setIfs(PyObject ifs) {
+ this.ifs = AstAdapters.py2exprList(ifs);
+ }
+
+
+ private final static PyString[] fields =
+ new PyString[] {new PyString("target"), new PyString("iter"), new PyString("ifs")};
+ @ExposedGet(name = "_fields")
+ public PyString[] get_fields() { return fields; }
+
+ private final static PyString[] attributes = new PyString[0];
+ @ExposedGet(name = "_attributes")
+ public PyString[] get_attributes() { return attributes; }
+
+ public comprehension() {
+ this(TYPE);
+ }
+ public comprehension(PyType subType) {
+ super(subType);
+ }
+ @ExposedNew
+ @ExposedMethod
+ public void comprehension___init__(PyObject[] args, String[] keywords) {
+ ArgParser ap = new ArgParser("comprehension", args, keywords, new String[]
+ {"target", "iter", "ifs"}, 3);
+ setTarget(ap.getPyObject(0));
+ setIter(ap.getPyObject(1));
+ setIfs(ap.getPyObject(2));
+ }
+
+ public comprehension(PyObject target, PyObject iter, PyObject ifs) {
+ setTarget(target);
+ setIter(iter);
+ setIfs(ifs);
+ }
+
+ public comprehension(Token token, expr target, expr iter, java.util.List<expr> ifs) {
+ super(token);
+ this.target = target;
+ addChild(target);
+ this.iter = iter;
+ addChild(iter);
+ this.ifs = ifs;
+ if (ifs == null) {
+ this.ifs = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.ifs) {
+ addChild(t);
+ }
+ }
+
+ public comprehension(Integer ttype, Token token, expr target, expr iter, java.util.List<expr>
+ ifs) {
+ super(ttype, token);
+ this.target = target;
+ addChild(target);
+ this.iter = iter;
+ addChild(iter);
+ this.ifs = ifs;
+ if (ifs == null) {
+ this.ifs = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.ifs) {
+ addChild(t);
+ }
+ }
+
+ public comprehension(PythonTree tree, expr target, expr iter, java.util.List<expr> ifs) {
+ super(tree);
+ this.target = target;
+ addChild(target);
+ this.iter = iter;
+ addChild(iter);
+ this.ifs = ifs;
+ if (ifs == null) {
+ this.ifs = new ArrayList<expr>();
+ }
+ for(PythonTree t : this.ifs) {
+ addChild(t);
+ }
+ }
+
+ @ExposedGet(name = "repr")
+ public String toString() {
+ return "comprehension";
+ }
+
+ public String toStringTree() {
+ StringBuffer sb = new StringBuffer("comprehension(");
+ sb.append("target=");
+ sb.append(dumpThis(target));
+ sb.append(",");
+ sb.append("iter=");
+ sb.append(dumpThis(iter));
+ sb.append(",");
+ sb.append("ifs=");
+ sb.append(dumpThis(ifs));
+ sb.append(",");
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public <R> R accept(VisitorIF<R> visitor) throws Exception {
+ traverse(visitor);
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ if (target != null)
+ target.accept(visitor);
+ if (iter != null)
+ iter.accept(visitor);
+ if (ifs != null) {
+ for (PythonTree t : ifs) {
+ if (t != null)
+ t.accept(visitor);
+ }
+ }
+ }
+
+}
Added: trunk/jython/src/org/python/antlr/ast/keyword.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/keyword.java (rev 0)
+++ trunk/jython/src/org/python/antlr/ast/keyword.java 2008-12-05 01:11:47 UTC (rev 5696)
@@ -0,0 +1,136 @@
+// Autogenerated AST node
+package org.python.antlr.ast;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.Token;
+import org.python.antlr.AST;
+import org.python.antlr.PythonTree;
+import org.python.antlr.adapter.AstAdapters;
+import org.python.antlr.base.excepthandler;
+import org.python.antlr.base.expr;
+import org.python.antlr.base.mod;
+import org.python.antlr.base.slice;
+import org.python.antlr.base.stmt;
+import org.python.core.ArgParser;
+import org.python.core.AstList;
+import org.python.core.Py;
+import org.python.core.PyObject;
+import org.python.core.PyString;
+import org.python.core.PyType;
+import org.python.expose.ExposedGet;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedSet;
+import org.python.expose.ExposedType;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+@ExposedType(name = "_ast.keyword", base = AST.class)
+public class keyword extends PythonTree {
+ public static final PyType TYPE = PyType.fromClass(keyword.class);
+ private String arg;
+ public String getInternalArg() {
+ return arg;
+ }
+ @ExposedGet(name = "arg")
+ public PyObject getArg() {
+ if (arg == null) return Py.None;
+ return new PyString(arg);
+ }
+ @ExposedSet(name = "arg")
+ public void setArg(PyObject arg) {
+ this.arg = AstAdapters.py2identifier(arg);
+ }
+
+ private expr value;
+ public expr getInternalValue() {
+ return value;
+ }
+ @ExposedGet(name = "value")
+ public PyObject getValue() {
+ return value;
+ }
+ @ExposedSet(name = "value")
+ public void setValue(PyObject value) {
+ this.value = AstAdapters.py2expr(value);
+ }
+
+
+ private final static PyString[] fields =
+ new PyString[] {new PyString("arg"), new PyString("value")};
+ @ExposedGet(name = "_fields")
+ public PyString[] get_fields() { return fields; }
+
+ private final static PyString[] attributes = new PyString[0];
+ @ExposedGet(name = "_attributes")
+ public PyString[] get_attributes() { return attributes; }
+
+ public keyword() {
+ this(TYPE);
+ }
+ public keyword(PyType subType) {
+ super(subType);
+ }
+ @ExposedNew
+ @ExposedMethod
+ public void keyword___init__(PyObject[] args, String[] keywords) {
+ ArgParser ap = new ArgParser("keyword", args, keywords, new String[]
+ {"arg", "value"}, 2);
+ setArg(ap.getPyObject(0));
+ setValue(ap.getPyObject(1));
+ }
+
+ public keyword(PyObject arg, PyObject value) {
+ setArg(arg);
+ setValue(value);
+ }
+
+ public keyword(Token token, String arg, expr value) {
+ super(token);
+ this.arg = arg;
+ this.value = value;
+ addChild(value);
+ }
+
+ public keyword(Integer ttype, Token token, String arg, expr value) {
+ super(ttype, token);
+ this.arg = arg;
+ this.value = value;
+ addChild(value);
+ }
+
+ public keyword(PythonTree tree, String arg, expr value) {
+ super(tree);
+ this.arg = arg;
+ this.value = value;
+ addChild(value);
+ }
+
+ @ExposedGet(name = "repr")
+ public String toString() {
+ return "keyword";
+ }
+
+ public String toStringTree() {
+ StringBuffer sb = new StringBuffer("keyword(");
+ sb.append("arg=");
+ sb.append(dumpThis(arg));
+ sb.append(",");
+ sb.append("value=");
+ sb.append(dumpThis(value));
+ sb.append(",");
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public <R> R accept(VisitorIF<R> visitor) throws Exception {
+ traverse(visitor);
+ return null;
+ }
+
+ public void traverse(VisitorIF visitor) throws Exception {
+ if (value != null)
+ value.accept(visitor);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pj...@us...> - 2009-05-30 22:47:41
|
Revision: 6431
http://jython.svn.sourceforge.net/jython/?rev=6431&view=rev
Author: pjenvey
Date: 2009-05-30 22:47:39 +0000 (Sat, 30 May 2009)
Log Message:
-----------
regen per r6430
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/ast/Assert.java
trunk/jython/src/org/python/antlr/ast/Assign.java
trunk/jython/src/org/python/antlr/ast/Attribute.java
trunk/jython/src/org/python/antlr/ast/AugAssign.java
trunk/jython/src/org/python/antlr/ast/BinOp.java
trunk/jython/src/org/python/antlr/ast/BoolOp.java
trunk/jython/src/org/python/antlr/ast/Break.java
trunk/jython/src/org/python/antlr/ast/Call.java
trunk/jython/src/org/python/antlr/ast/ClassDef.java
trunk/jython/src/org/python/antlr/ast/Compare.java
trunk/jython/src/org/python/antlr/ast/Continue.java
trunk/jython/src/org/python/antlr/ast/Delete.java
trunk/jython/src/org/python/antlr/ast/Dict.java
trunk/jython/src/org/python/antlr/ast/Ellipsis.java
trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
trunk/jython/src/org/python/antlr/ast/Exec.java
trunk/jython/src/org/python/antlr/ast/Expr.java
trunk/jython/src/org/python/antlr/ast/Expression.java
trunk/jython/src/org/python/antlr/ast/ExtSlice.java
trunk/jython/src/org/python/antlr/ast/For.java
trunk/jython/src/org/python/antlr/ast/FunctionDef.java
trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
trunk/jython/src/org/python/antlr/ast/Global.java
trunk/jython/src/org/python/antlr/ast/If.java
trunk/jython/src/org/python/antlr/ast/IfExp.java
trunk/jython/src/org/python/antlr/ast/Import.java
trunk/jython/src/org/python/antlr/ast/ImportFrom.java
trunk/jython/src/org/python/antlr/ast/Index.java
trunk/jython/src/org/python/antlr/ast/Interactive.java
trunk/jython/src/org/python/antlr/ast/Lambda.java
trunk/jython/src/org/python/antlr/ast/List.java
trunk/jython/src/org/python/antlr/ast/ListComp.java
trunk/jython/src/org/python/antlr/ast/Module.java
trunk/jython/src/org/python/antlr/ast/Name.java
trunk/jython/src/org/python/antlr/ast/Num.java
trunk/jython/src/org/python/antlr/ast/Pass.java
trunk/jython/src/org/python/antlr/ast/Print.java
trunk/jython/src/org/python/antlr/ast/Raise.java
trunk/jython/src/org/python/antlr/ast/Repr.java
trunk/jython/src/org/python/antlr/ast/Return.java
trunk/jython/src/org/python/antlr/ast/Slice.java
trunk/jython/src/org/python/antlr/ast/Str.java
trunk/jython/src/org/python/antlr/ast/Subscript.java
trunk/jython/src/org/python/antlr/ast/Suite.java
trunk/jython/src/org/python/antlr/ast/TryExcept.java
trunk/jython/src/org/python/antlr/ast/TryFinally.java
trunk/jython/src/org/python/antlr/ast/Tuple.java
trunk/jython/src/org/python/antlr/ast/UnaryOp.java
trunk/jython/src/org/python/antlr/ast/While.java
trunk/jython/src/org/python/antlr/ast/With.java
trunk/jython/src/org/python/antlr/ast/Yield.java
trunk/jython/src/org/python/antlr/ast/alias.java
trunk/jython/src/org/python/antlr/ast/arguments.java
trunk/jython/src/org/python/antlr/ast/comprehension.java
trunk/jython/src/org/python/antlr/ast/keyword.java
Modified: trunk/jython/src/org/python/antlr/ast/Assert.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assert.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Assert.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -140,7 +140,7 @@
return visitor.visitAssert(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (test != null)
test.accept(visitor);
if (msg != null)
Modified: trunk/jython/src/org/python/antlr/ast/Assign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assign.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Assign.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -155,7 +155,7 @@
return visitor.visitAssign(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (targets != null) {
for (PythonTree t : targets) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Attribute.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -159,7 +159,7 @@
return visitor.visitAttribute(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -161,7 +161,7 @@
return visitor.visitAugAssign(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (target != null)
target.accept(visitor);
if (value != null)
Modified: trunk/jython/src/org/python/antlr/ast/BinOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -161,7 +161,7 @@
return visitor.visitBinOp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (left != null)
left.accept(visitor);
if (right != null)
Modified: trunk/jython/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -152,7 +152,7 @@
return visitor.visitBoolOp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (values != null) {
for (PythonTree t : values) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Break.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Break.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Break.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -88,7 +88,7 @@
return visitor.visitBreak(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/Call.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Call.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Call.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -247,7 +247,7 @@
return visitor.visitCall(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (func != null)
func.accept(visitor);
if (args != null) {
Modified: trunk/jython/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -235,7 +235,7 @@
return visitor.visitClassDef(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (bases != null) {
for (PythonTree t : bases) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Compare.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Compare.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Compare.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -179,7 +179,7 @@
return visitor.visitCompare(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (left != null)
left.accept(visitor);
if (comparators != null) {
Modified: trunk/jython/src/org/python/antlr/ast/Continue.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Continue.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Continue.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -88,7 +88,7 @@
return visitor.visitContinue(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/Delete.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Delete.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Delete.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -131,7 +131,7 @@
return visitor.visitDelete(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (targets != null) {
for (PythonTree t : targets) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Dict.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Dict.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Dict.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -171,7 +171,7 @@
return visitor.visitDict(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (keys != null) {
for (PythonTree t : keys) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -77,7 +77,7 @@
return visitor.visitEllipsis(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
}
Modified: trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -180,7 +180,7 @@
return visitor.visitExceptHandler(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (type != null)
type.accept(visitor);
if (name != null)
Modified: trunk/jython/src/org/python/antlr/ast/Exec.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Exec.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Exec.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -164,7 +164,7 @@
return visitor.visitExec(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null)
body.accept(visitor);
if (globals != null)
Modified: trunk/jython/src/org/python/antlr/ast/Expr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expr.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Expr.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -116,7 +116,7 @@
return visitor.visitExpr(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/Expression.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expression.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Expression.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -105,7 +105,7 @@
return visitor.visitExpression(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null)
body.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -120,7 +120,7 @@
return visitor.visitExtSlice(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (dims != null) {
for (PythonTree t : dims) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/For.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/For.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/For.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -222,7 +222,7 @@
return visitor.visitFor(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (target != null)
target.accept(visitor);
if (iter != null)
Modified: trunk/jython/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -217,7 +217,7 @@
return visitor.visitFunctionDef(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (args != null)
args.accept(visitor);
if (body != null) {
Modified: trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -156,7 +156,7 @@
return visitor.visitGeneratorExp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (elt != null)
elt.accept(visitor);
if (generators != null) {
Modified: trunk/jython/src/org/python/antlr/ast/Global.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Global.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Global.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -113,7 +113,7 @@
return visitor.visitGlobal(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/If.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/If.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/If.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -195,7 +195,7 @@
return visitor.visitIf(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (test != null)
test.accept(visitor);
if (body != null) {
Modified: trunk/jython/src/org/python/antlr/ast/IfExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -164,7 +164,7 @@
return visitor.visitIfExp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (test != null)
test.accept(visitor);
if (body != null)
Modified: trunk/jython/src/org/python/antlr/ast/Import.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Import.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Import.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -131,7 +131,7 @@
return visitor.visitImport(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (names != null) {
for (PythonTree t : names) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -175,7 +175,7 @@
return visitor.visitImportFrom(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (names != null) {
for (PythonTree t : names) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Index.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Index.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Index.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -105,7 +105,7 @@
return visitor.visitIndex(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/Interactive.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -120,7 +120,7 @@
return visitor.visitInteractive(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null) {
for (PythonTree t : body) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Lambda.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -137,7 +137,7 @@
return visitor.visitLambda(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (args != null)
args.accept(visitor);
if (body != null)
Modified: trunk/jython/src/org/python/antlr/ast/List.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/List.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/List.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -152,7 +152,7 @@
return visitor.visitList(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (elts != null) {
for (PythonTree t : elts) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/ListComp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -156,7 +156,7 @@
return visitor.visitListComp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (elt != null)
elt.accept(visitor);
if (generators != null) {
Modified: trunk/jython/src/org/python/antlr/ast/Module.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Module.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Module.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -120,7 +120,7 @@
return visitor.visitModule(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null) {
for (PythonTree t : body) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Name.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Name.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Name.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -135,7 +135,7 @@
return visitor.visitName(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
public void setContext(expr_contextType c) {
Modified: trunk/jython/src/org/python/antlr/ast/Num.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Num.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Num.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -113,7 +113,7 @@
return visitor.visitNum(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/Pass.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Pass.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Pass.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -88,7 +88,7 @@
return visitor.visitPass(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/Print.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Print.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Print.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -177,7 +177,7 @@
return visitor.visitPrint(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (dest != null)
dest.accept(visitor);
if (values != null) {
Modified: trunk/jython/src/org/python/antlr/ast/Raise.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Raise.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Raise.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -164,7 +164,7 @@
return visitor.visitRaise(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (type != null)
type.accept(visitor);
if (inst != null)
Modified: trunk/jython/src/org/python/antlr/ast/Repr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Repr.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Repr.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -116,7 +116,7 @@
return visitor.visitRepr(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/Return.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Return.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Return.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -116,7 +116,7 @@
return visitor.visitReturn(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/Slice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Slice.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Slice.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -153,7 +153,7 @@
return visitor.visitSlice(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (lower != null)
lower.accept(visitor);
if (upper != null)
Modified: trunk/jython/src/org/python/antlr/ast/Str.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Str.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Str.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -113,7 +113,7 @@
return visitor.visitStr(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
private int lineno = -1;
Modified: trunk/jython/src/org/python/antlr/ast/Subscript.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -158,7 +158,7 @@
return visitor.visitSubscript(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
if (slice != null)
Modified: trunk/jython/src/org/python/antlr/ast/Suite.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Suite.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Suite.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -120,7 +120,7 @@
return visitor.visitSuite(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null) {
for (PythonTree t : body) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -212,7 +212,7 @@
return visitor.visitTryExcept(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null) {
for (PythonTree t : body) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -171,7 +171,7 @@
return visitor.visitTryFinally(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (body != null) {
for (PythonTree t : body) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/Tuple.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -152,7 +152,7 @@
return visitor.visitTuple(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (elts != null) {
for (PythonTree t : elts) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -137,7 +137,7 @@
return visitor.visitUnaryOp(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (operand != null)
operand.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/While.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/While.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/While.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -196,7 +196,7 @@
return visitor.visitWhile(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (test != null)
test.accept(visitor);
if (body != null) {
Modified: trunk/jython/src/org/python/antlr/ast/With.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/With.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/With.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -181,7 +181,7 @@
return visitor.visitWith(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (context_expr != null)
context_expr.accept(visitor);
if (optional_vars != null)
Modified: trunk/jython/src/org/python/antlr/ast/Yield.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Yield.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/Yield.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -116,7 +116,7 @@
return visitor.visitYield(this);
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
Modified: trunk/jython/src/org/python/antlr/ast/alias.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/alias.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/alias.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -126,7 +126,7 @@
return null;
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
}
}
Modified: trunk/jython/src/org/python/antlr/ast/arguments.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/arguments.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/arguments.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -208,7 +208,7 @@
return null;
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (args != null) {
for (PythonTree t : args) {
if (t != null)
Modified: trunk/jython/src/org/python/antlr/ast/comprehension.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -170,7 +170,7 @@
return null;
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (target != null)
target.accept(visitor);
if (iter != null)
Modified: trunk/jython/src/org/python/antlr/ast/keyword.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/keyword.java 2009-05-30 22:46:21 UTC (rev 6430)
+++ trunk/jython/src/org/python/antlr/ast/keyword.java 2009-05-30 22:47:39 UTC (rev 6431)
@@ -128,7 +128,7 @@
return null;
}
- public void traverse(VisitorIF visitor) throws Exception {
+ public void traverse(VisitorIF<?> visitor) throws Exception {
if (value != null)
value.accept(visitor);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fwi...@us...> - 2009-08-04 23:52:58
|
Revision: 6631
http://jython.svn.sourceforge.net/jython/?rev=6631&view=rev
Author: fwierzbicki
Date: 2009-08-04 23:52:49 +0000 (Tue, 04 Aug 2009)
Log Message:
-----------
AST codegen, should fix http://bugs.jython.org/issue1415
Modified Paths:
--------------
trunk/jython/src/org/python/antlr/ast/Assert.java
trunk/jython/src/org/python/antlr/ast/Assign.java
trunk/jython/src/org/python/antlr/ast/Attribute.java
trunk/jython/src/org/python/antlr/ast/AugAssign.java
trunk/jython/src/org/python/antlr/ast/BinOp.java
trunk/jython/src/org/python/antlr/ast/BoolOp.java
trunk/jython/src/org/python/antlr/ast/Break.java
trunk/jython/src/org/python/antlr/ast/Call.java
trunk/jython/src/org/python/antlr/ast/ClassDef.java
trunk/jython/src/org/python/antlr/ast/Compare.java
trunk/jython/src/org/python/antlr/ast/Continue.java
trunk/jython/src/org/python/antlr/ast/Delete.java
trunk/jython/src/org/python/antlr/ast/Dict.java
trunk/jython/src/org/python/antlr/ast/Ellipsis.java
trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
trunk/jython/src/org/python/antlr/ast/Exec.java
trunk/jython/src/org/python/antlr/ast/Expr.java
trunk/jython/src/org/python/antlr/ast/Expression.java
trunk/jython/src/org/python/antlr/ast/ExtSlice.java
trunk/jython/src/org/python/antlr/ast/For.java
trunk/jython/src/org/python/antlr/ast/FunctionDef.java
trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
trunk/jython/src/org/python/antlr/ast/Global.java
trunk/jython/src/org/python/antlr/ast/If.java
trunk/jython/src/org/python/antlr/ast/IfExp.java
trunk/jython/src/org/python/antlr/ast/Import.java
trunk/jython/src/org/python/antlr/ast/ImportFrom.java
trunk/jython/src/org/python/antlr/ast/Index.java
trunk/jython/src/org/python/antlr/ast/Interactive.java
trunk/jython/src/org/python/antlr/ast/Lambda.java
trunk/jython/src/org/python/antlr/ast/List.java
trunk/jython/src/org/python/antlr/ast/ListComp.java
trunk/jython/src/org/python/antlr/ast/Module.java
trunk/jython/src/org/python/antlr/ast/Name.java
trunk/jython/src/org/python/antlr/ast/Num.java
trunk/jython/src/org/python/antlr/ast/Pass.java
trunk/jython/src/org/python/antlr/ast/Print.java
trunk/jython/src/org/python/antlr/ast/Raise.java
trunk/jython/src/org/python/antlr/ast/Repr.java
trunk/jython/src/org/python/antlr/ast/Return.java
trunk/jython/src/org/python/antlr/ast/Slice.java
trunk/jython/src/org/python/antlr/ast/Str.java
trunk/jython/src/org/python/antlr/ast/Subscript.java
trunk/jython/src/org/python/antlr/ast/Suite.java
trunk/jython/src/org/python/antlr/ast/TryExcept.java
trunk/jython/src/org/python/antlr/ast/TryFinally.java
trunk/jython/src/org/python/antlr/ast/Tuple.java
trunk/jython/src/org/python/antlr/ast/UnaryOp.java
trunk/jython/src/org/python/antlr/ast/While.java
trunk/jython/src/org/python/antlr/ast/With.java
trunk/jython/src/org/python/antlr/ast/Yield.java
trunk/jython/src/org/python/antlr/ast/alias.java
trunk/jython/src/org/python/antlr/ast/arguments.java
trunk/jython/src/org/python/antlr/ast/comprehension.java
trunk/jython/src/org/python/antlr/ast/keyword.java
Modified: trunk/jython/src/org/python/antlr/ast/Assert.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assert.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Assert.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Assert___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Assert", args, keywords, new String[]
- {"test", "msg", "lineno", "col_offset"}, 2);
- setTest(ap.getPyObject(0));
- setMsg(ap.getPyObject(1));
+ {"test", "msg", "lineno", "col_offset"}, 2, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setMsg(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Assign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Assign.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Assign.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Assign___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Assign", args, keywords, new String[]
- {"targets", "value", "lineno", "col_offset"}, 2);
- setTargets(ap.getPyObject(0));
- setValue(ap.getPyObject(1));
+ {"targets", "value", "lineno", "col_offset"}, 2, true);
+ setTargets(ap.getPyObject(0, Py.None));
+ setValue(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Attribute.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Attribute.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void Attribute___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Attribute", args, keywords, new String[]
- {"value", "attr", "ctx", "lineno", "col_offset"}, 3);
- setValue(ap.getPyObject(0));
- setAttr(ap.getPyObject(1));
- setCtx(ap.getPyObject(2));
+ {"value", "attr", "ctx", "lineno", "col_offset"}, 3, true);
+ setValue(ap.getPyObject(0, Py.None));
+ setAttr(ap.getPyObject(1, Py.None));
+ setCtx(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/AugAssign.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/AugAssign.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void AugAssign___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("AugAssign", args, keywords, new String[]
- {"target", "op", "value", "lineno", "col_offset"}, 3);
- setTarget(ap.getPyObject(0));
- setOp(ap.getPyObject(1));
- setValue(ap.getPyObject(2));
+ {"target", "op", "value", "lineno", "col_offset"}, 3, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setOp(ap.getPyObject(1, Py.None));
+ setValue(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/BinOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/BinOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void BinOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("BinOp", args, keywords, new String[]
- {"left", "op", "right", "lineno", "col_offset"}, 3);
- setLeft(ap.getPyObject(0));
- setOp(ap.getPyObject(1));
- setRight(ap.getPyObject(2));
+ {"left", "op", "right", "lineno", "col_offset"}, 3, true);
+ setLeft(ap.getPyObject(0, Py.None));
+ setOp(ap.getPyObject(1, Py.None));
+ setRight(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/BoolOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/BoolOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void BoolOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("BoolOp", args, keywords, new String[]
- {"op", "values", "lineno", "col_offset"}, 2);
- setOp(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
+ {"op", "values", "lineno", "col_offset"}, 2, true);
+ setOp(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Break.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Break.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Break.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Break___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Break", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Call.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Call.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Call.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -115,12 +115,12 @@
@ExposedMethod
public void Call___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Call", args, keywords, new String[]
- {"func", "args", "keywords", "starargs", "kwargs", "lineno", "col_offset"}, 5);
- setFunc(ap.getPyObject(0));
- setArgs(ap.getPyObject(1));
- setKeywords(ap.getPyObject(2));
- setStarargs(ap.getPyObject(3));
- setKwargs(ap.getPyObject(4));
+ {"func", "args", "keywords", "starargs", "kwargs", "lineno", "col_offset"}, 5, true);
+ setFunc(ap.getPyObject(0, Py.None));
+ setArgs(ap.getPyObject(1, Py.None));
+ setKeywords(ap.getPyObject(2, Py.None));
+ setStarargs(ap.getPyObject(3, Py.None));
+ setKwargs(ap.getPyObject(4, Py.None));
int lin = ap.getInt(5, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ClassDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ClassDef.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void ClassDef___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ClassDef", args, keywords, new String[]
- {"name", "bases", "body", "decorator_list", "lineno", "col_offset"}, 4);
- setName(ap.getPyObject(0));
- setBases(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setDecorator_list(ap.getPyObject(3));
+ {"name", "bases", "body", "decorator_list", "lineno", "col_offset"}, 4, true);
+ setName(ap.getPyObject(0, Py.None));
+ setBases(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setDecorator_list(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Compare.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Compare.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Compare.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Compare___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Compare", args, keywords, new String[]
- {"left", "ops", "comparators", "lineno", "col_offset"}, 3);
- setLeft(ap.getPyObject(0));
- setOps(ap.getPyObject(1));
- setComparators(ap.getPyObject(2));
+ {"left", "ops", "comparators", "lineno", "col_offset"}, 3, true);
+ setLeft(ap.getPyObject(0, Py.None));
+ setOps(ap.getPyObject(1, Py.None));
+ setComparators(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Continue.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Continue.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Continue.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Continue___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Continue", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Delete.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Delete.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Delete.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Delete___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Delete", args, keywords, new String[]
- {"targets", "lineno", "col_offset"}, 1);
- setTargets(ap.getPyObject(0));
+ {"targets", "lineno", "col_offset"}, 1, true);
+ setTargets(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Dict.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Dict.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Dict.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Dict___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Dict", args, keywords, new String[]
- {"keys", "values", "lineno", "col_offset"}, 2);
- setKeys(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
+ {"keys", "values", "lineno", "col_offset"}, 2, true);
+ setKeys(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Ellipsis.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Ellipsis.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -44,7 +44,7 @@
@ExposedMethod
public void Ellipsis___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Ellipsis", args, keywords, new String[]
- {}, 0);
+ {}, 0, true);
}
public Ellipsis() {
Modified: trunk/jython/src/org/python/antlr/ast/ExceptHandler.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ExceptHandler.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void ExceptHandler___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ExceptHandler", args, keywords, new String[]
- {"type", "name", "body", "lineno", "col_offset"}, 3);
- setExceptType(ap.getPyObject(0));
- setName(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
+ {"type", "name", "body", "lineno", "col_offset"}, 3, true);
+ setExceptType(ap.getPyObject(0, Py.None));
+ setName(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Exec.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Exec.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Exec.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Exec___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Exec", args, keywords, new String[]
- {"body", "globals", "locals", "lineno", "col_offset"}, 3);
- setBody(ap.getPyObject(0));
- setGlobals(ap.getPyObject(1));
- setLocals(ap.getPyObject(2));
+ {"body", "globals", "locals", "lineno", "col_offset"}, 3, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setGlobals(ap.getPyObject(1, Py.None));
+ setLocals(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Expr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expr.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Expr.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Expr___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Expr", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Expression.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Expression.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Expression.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Expression___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Expression", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Expression(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/ExtSlice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ExtSlice.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void ExtSlice___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ExtSlice", args, keywords, new String[]
- {"dims"}, 1);
- setDims(ap.getPyObject(0));
+ {"dims"}, 1, true);
+ setDims(ap.getPyObject(0, Py.None));
}
public ExtSlice(PyObject dims) {
Modified: trunk/jython/src/org/python/antlr/ast/For.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/For.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/For.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -102,11 +102,11 @@
@ExposedMethod
public void For___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("For", args, keywords, new String[]
- {"target", "iter", "body", "orelse", "lineno", "col_offset"}, 4);
- setTarget(ap.getPyObject(0));
- setIter(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setOrelse(ap.getPyObject(3));
+ {"target", "iter", "body", "orelse", "lineno", "col_offset"}, 4, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setIter(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setOrelse(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/FunctionDef.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/FunctionDef.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void FunctionDef___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("FunctionDef", args, keywords, new String[]
- {"name", "args", "body", "decorator_list", "lineno", "col_offset"}, 4);
- setName(ap.getPyObject(0));
- setArgs(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
- setDecorator_list(ap.getPyObject(3));
+ {"name", "args", "body", "decorator_list", "lineno", "col_offset"}, 4, true);
+ setName(ap.getPyObject(0, Py.None));
+ setArgs(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
+ setDecorator_list(ap.getPyObject(3, Py.None));
int lin = ap.getInt(4, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/GeneratorExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/GeneratorExp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void GeneratorExp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("GeneratorExp", args, keywords, new String[]
- {"elt", "generators", "lineno", "col_offset"}, 2);
- setElt(ap.getPyObject(0));
- setGenerators(ap.getPyObject(1));
+ {"elt", "generators", "lineno", "col_offset"}, 2, true);
+ setElt(ap.getPyObject(0, Py.None));
+ setGenerators(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Global.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Global.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Global.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Global___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Global", args, keywords, new String[]
- {"names", "lineno", "col_offset"}, 1);
- setNames(ap.getPyObject(0));
+ {"names", "lineno", "col_offset"}, 1, true);
+ setNames(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/If.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/If.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/If.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void If___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("If", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/IfExp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/IfExp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void IfExp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("IfExp", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Import.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Import.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Import.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Import___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Import", args, keywords, new String[]
- {"names", "lineno", "col_offset"}, 1);
- setNames(ap.getPyObject(0));
+ {"names", "lineno", "col_offset"}, 1, true);
+ setNames(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ImportFrom.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ImportFrom.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void ImportFrom___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ImportFrom", args, keywords, new String[]
- {"module", "names", "level", "lineno", "col_offset"}, 3);
- setModule(ap.getPyObject(0));
- setNames(ap.getPyObject(1));
- setLevel(ap.getPyObject(2));
+ {"module", "names", "level", "lineno", "col_offset"}, 3, true);
+ setModule(ap.getPyObject(0, Py.None));
+ setNames(ap.getPyObject(1, Py.None));
+ setLevel(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Index.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Index.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Index.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Index___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Index", args, keywords, new String[]
- {"value"}, 1);
- setValue(ap.getPyObject(0));
+ {"value"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
}
public Index(PyObject value) {
Modified: trunk/jython/src/org/python/antlr/ast/Interactive.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Interactive.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Interactive___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Interactive", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Interactive(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/Lambda.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Lambda.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Lambda___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Lambda", args, keywords, new String[]
- {"args", "body", "lineno", "col_offset"}, 2);
- setArgs(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
+ {"args", "body", "lineno", "col_offset"}, 2, true);
+ setArgs(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/List.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/List.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/List.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void List___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("List", args, keywords, new String[]
- {"elts", "ctx", "lineno", "col_offset"}, 2);
- setElts(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"elts", "ctx", "lineno", "col_offset"}, 2, true);
+ setElts(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/ListComp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/ListComp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void ListComp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("ListComp", args, keywords, new String[]
- {"elt", "generators", "lineno", "col_offset"}, 2);
- setElt(ap.getPyObject(0));
- setGenerators(ap.getPyObject(1));
+ {"elt", "generators", "lineno", "col_offset"}, 2, true);
+ setElt(ap.getPyObject(0, Py.None));
+ setGenerators(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Module.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Module.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Module.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Module___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Module", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Module(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/Name.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Name.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Name.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -76,9 +76,9 @@
@ExposedMethod
public void Name___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Name", args, keywords, new String[]
- {"id", "ctx", "lineno", "col_offset"}, 2);
- setId(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"id", "ctx", "lineno", "col_offset"}, 2, true);
+ setId(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Num.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Num.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Num.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Num___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Num", args, keywords, new String[]
- {"n", "lineno", "col_offset"}, 1);
- setN(ap.getPyObject(0));
+ {"n", "lineno", "col_offset"}, 1, true);
+ setN(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Pass.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Pass.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Pass.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -45,7 +45,7 @@
@ExposedMethod
public void Pass___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Pass", args, keywords, new String[]
- {"lineno", "col_offset"}, 0);
+ {"lineno", "col_offset"}, 0, true);
int lin = ap.getInt(0, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Print.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Print.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Print.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void Print___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Print", args, keywords, new String[]
- {"dest", "values", "nl", "lineno", "col_offset"}, 3);
- setDest(ap.getPyObject(0));
- setValues(ap.getPyObject(1));
- setNl(ap.getPyObject(2));
+ {"dest", "values", "nl", "lineno", "col_offset"}, 3, true);
+ setDest(ap.getPyObject(0, Py.None));
+ setValues(ap.getPyObject(1, Py.None));
+ setNl(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Raise.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Raise.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Raise.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Raise___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Raise", args, keywords, new String[]
- {"type", "inst", "tback", "lineno", "col_offset"}, 3);
- setExceptType(ap.getPyObject(0));
- setInst(ap.getPyObject(1));
- setTback(ap.getPyObject(2));
+ {"type", "inst", "tback", "lineno", "col_offset"}, 3, true);
+ setExceptType(ap.getPyObject(0, Py.None));
+ setInst(ap.getPyObject(1, Py.None));
+ setTback(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Repr.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Repr.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Repr.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Repr___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Repr", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Return.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Return.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Return.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Return___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Return", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Slice.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Slice.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Slice.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -87,10 +87,10 @@
@ExposedMethod
public void Slice___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Slice", args, keywords, new String[]
- {"lower", "upper", "step"}, 3);
- setLower(ap.getPyObject(0));
- setUpper(ap.getPyObject(1));
- setStep(ap.getPyObject(2));
+ {"lower", "upper", "step"}, 3, true);
+ setLower(ap.getPyObject(0, Py.None));
+ setUpper(ap.getPyObject(1, Py.None));
+ setStep(ap.getPyObject(2, Py.None));
}
public Slice(PyObject lower, PyObject upper, PyObject step) {
Modified: trunk/jython/src/org/python/antlr/ast/Str.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Str.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Str.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Str___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Str", args, keywords, new String[]
- {"s", "lineno", "col_offset"}, 1);
- setS(ap.getPyObject(0));
+ {"s", "lineno", "col_offset"}, 1, true);
+ setS(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Subscript.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Subscript.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void Subscript___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Subscript", args, keywords, new String[]
- {"value", "slice", "ctx", "lineno", "col_offset"}, 3);
- setValue(ap.getPyObject(0));
- setSlice(ap.getPyObject(1));
- setCtx(ap.getPyObject(2));
+ {"value", "slice", "ctx", "lineno", "col_offset"}, 3, true);
+ setValue(ap.getPyObject(0, Py.None));
+ setSlice(ap.getPyObject(1, Py.None));
+ setCtx(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Suite.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Suite.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Suite.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -61,8 +61,8 @@
@ExposedMethod
public void Suite___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Suite", args, keywords, new String[]
- {"body"}, 1);
- setBody(ap.getPyObject(0));
+ {"body"}, 1, true);
+ setBody(ap.getPyObject(0, Py.None));
}
public Suite(PyObject body) {
Modified: trunk/jython/src/org/python/antlr/ast/TryExcept.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/TryExcept.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void TryExcept___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("TryExcept", args, keywords, new String[]
- {"body", "handlers", "orelse", "lineno", "col_offset"}, 3);
- setBody(ap.getPyObject(0));
- setHandlers(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"body", "handlers", "orelse", "lineno", "col_offset"}, 3, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setHandlers(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/TryFinally.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/TryFinally.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void TryFinally___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("TryFinally", args, keywords, new String[]
- {"body", "finalbody", "lineno", "col_offset"}, 2);
- setBody(ap.getPyObject(0));
- setFinalbody(ap.getPyObject(1));
+ {"body", "finalbody", "lineno", "col_offset"}, 2, true);
+ setBody(ap.getPyObject(0, Py.None));
+ setFinalbody(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Tuple.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Tuple.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void Tuple___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Tuple", args, keywords, new String[]
- {"elts", "ctx", "lineno", "col_offset"}, 2);
- setElts(ap.getPyObject(0));
- setCtx(ap.getPyObject(1));
+ {"elts", "ctx", "lineno", "col_offset"}, 2, true);
+ setElts(ap.getPyObject(0, Py.None));
+ setCtx(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/UnaryOp.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/UnaryOp.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void UnaryOp___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("UnaryOp", args, keywords, new String[]
- {"op", "operand", "lineno", "col_offset"}, 2);
- setOp(ap.getPyObject(0));
- setOperand(ap.getPyObject(1));
+ {"op", "operand", "lineno", "col_offset"}, 2, true);
+ setOp(ap.getPyObject(0, Py.None));
+ setOperand(ap.getPyObject(1, Py.None));
int lin = ap.getInt(2, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/While.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/While.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/While.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -88,10 +88,10 @@
@ExposedMethod
public void While___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("While", args, keywords, new String[]
- {"test", "body", "orelse", "lineno", "col_offset"}, 3);
- setTest(ap.getPyObject(0));
- setBody(ap.getPyObject(1));
- setOrelse(ap.getPyObject(2));
+ {"test", "body", "orelse", "lineno", "col_offset"}, 3, true);
+ setTest(ap.getPyObject(0, Py.None));
+ setBody(ap.getPyObject(1, Py.None));
+ setOrelse(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/With.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/With.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/With.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -89,10 +89,10 @@
@ExposedMethod
public void With___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("With", args, keywords, new String[]
- {"context_expr", "optional_vars", "body", "lineno", "col_offset"}, 3);
- setContext_expr(ap.getPyObject(0));
- setOptional_vars(ap.getPyObject(1));
- setBody(ap.getPyObject(2));
+ {"context_expr", "optional_vars", "body", "lineno", "col_offset"}, 3, true);
+ setContext_expr(ap.getPyObject(0, Py.None));
+ setOptional_vars(ap.getPyObject(1, Py.None));
+ setBody(ap.getPyObject(2, Py.None));
int lin = ap.getInt(3, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/Yield.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/Yield.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/Yield.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -62,8 +62,8 @@
@ExposedMethod
public void Yield___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("Yield", args, keywords, new String[]
- {"value", "lineno", "col_offset"}, 1);
- setValue(ap.getPyObject(0));
+ {"value", "lineno", "col_offset"}, 1, true);
+ setValue(ap.getPyObject(0, Py.None));
int lin = ap.getInt(1, -1);
if (lin != -1) {
setLineno(lin);
Modified: trunk/jython/src/org/python/antlr/ast/alias.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/alias.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/alias.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -76,9 +76,9 @@
@ExposedMethod
public void alias___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("alias", args, keywords, new String[]
- {"name", "asname"}, 2);
- setName(ap.getPyObject(0));
- setAsname(ap.getPyObject(1));
+ {"name", "asname"}, 2, true);
+ setName(ap.getPyObject(0, Py.None));
+ setAsname(ap.getPyObject(1, Py.None));
}
public alias(PyObject name, PyObject asname) {
Modified: trunk/jython/src/org/python/antlr/ast/arguments.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/arguments.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/arguments.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -103,11 +103,11 @@
@ExposedMethod
public void arguments___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("arguments", args, keywords, new String[]
- {"args", "vararg", "kwarg", "defaults"}, 4);
- setArgs(ap.getPyObject(0));
- setVararg(ap.getPyObject(1));
- setKwarg(ap.getPyObject(2));
- setDefaults(ap.getPyObject(3));
+ {"args", "vararg", "kwarg", "defaults"}, 4, true);
+ setArgs(ap.getPyObject(0, Py.None));
+ setVararg(ap.getPyObject(1, Py.None));
+ setKwarg(ap.getPyObject(2, Py.None));
+ setDefaults(ap.getPyObject(3, Py.None));
}
public arguments(PyObject args, PyObject vararg, PyObject kwarg, PyObject defaults) {
Modified: trunk/jython/src/org/python/antlr/ast/comprehension.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/comprehension.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -87,10 +87,10 @@
@ExposedMethod
public void comprehension___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("comprehension", args, keywords, new String[]
- {"target", "iter", "ifs"}, 3);
- setTarget(ap.getPyObject(0));
- setIter(ap.getPyObject(1));
- setIfs(ap.getPyObject(2));
+ {"target", "iter", "ifs"}, 3, true);
+ setTarget(ap.getPyObject(0, Py.None));
+ setIter(ap.getPyObject(1, Py.None));
+ setIfs(ap.getPyObject(2, Py.None));
}
public comprehension(PyObject target, PyObject iter, PyObject ifs) {
Modified: trunk/jython/src/org/python/antlr/ast/keyword.java
===================================================================
--- trunk/jython/src/org/python/antlr/ast/keyword.java 2009-08-04 23:50:44 UTC (rev 6630)
+++ trunk/jython/src/org/python/antlr/ast/keyword.java 2009-08-04 23:52:49 UTC (rev 6631)
@@ -75,9 +75,9 @@
@ExposedMethod
public void keyword___init__(PyObject[] args, String[] keywords) {
ArgParser ap = new ArgParser("keyword", args, keywords, new String[]
- {"arg", "value"}, 2);
- setArg(ap.getPyObject(0));
- setValue(ap.getPyObject(1));
+ {"arg", "value"}, 2, true);
+ setArg(ap.getPyObject(0, Py.None));
+ setValue(ap.getPyObject(1, Py.None));
}
public keyword(PyObject arg, PyObject value) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X