[Jython-checkins] jython: Pull in hand coded ast work into code gen in asdl_antlr.
frank.wierzbicki
jython-checkins at python.org
Mon Apr 13 04:38:15 CEST 2015
https://hg.python.org/jython/rev/dd20fa095d72
changeset: 7659:dd20fa095d72
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Mon Apr 13 02:38:45 2015 +0000
summary:
Pull in hand coded ast work into code gen in asdl_antlr.
files:
ast/asdl_antlr.py | 125 +++++++++-
src/org/python/antlr/ast/Assert.java | 1 +
src/org/python/antlr/ast/Assign.java | 1 +
src/org/python/antlr/ast/Attribute.java | 2 +
src/org/python/antlr/ast/AugAssign.java | 1 +
src/org/python/antlr/ast/BinOp.java | 1 +
src/org/python/antlr/ast/BoolOp.java | 1 +
src/org/python/antlr/ast/Break.java | 1 +
src/org/python/antlr/ast/Call.java | 1 +
src/org/python/antlr/ast/ClassDef.java | 2 +
src/org/python/antlr/ast/Compare.java | 1 +
src/org/python/antlr/ast/Continue.java | 1 +
src/org/python/antlr/ast/Delete.java | 1 +
src/org/python/antlr/ast/Dict.java | 1 +
src/org/python/antlr/ast/DictComp.java | 1 +
src/org/python/antlr/ast/Ellipsis.java | 1 +
src/org/python/antlr/ast/ExceptHandler.java | 1 +
src/org/python/antlr/ast/Exec.java | 1 +
src/org/python/antlr/ast/Expr.java | 1 +
src/org/python/antlr/ast/Expression.java | 1 +
src/org/python/antlr/ast/ExtSlice.java | 1 +
src/org/python/antlr/ast/For.java | 1 +
src/org/python/antlr/ast/FunctionDef.java | 2 +
src/org/python/antlr/ast/GeneratorExp.java | 1 +
src/org/python/antlr/ast/Global.java | 2 +
src/org/python/antlr/ast/If.java | 1 +
src/org/python/antlr/ast/IfExp.java | 1 +
src/org/python/antlr/ast/Import.java | 1 +
src/org/python/antlr/ast/ImportFrom.java | 2 +
src/org/python/antlr/ast/Index.java | 1 +
src/org/python/antlr/ast/Interactive.java | 1 +
src/org/python/antlr/ast/Lambda.java | 1 +
src/org/python/antlr/ast/List.java | 1 +
src/org/python/antlr/ast/ListComp.java | 1 +
src/org/python/antlr/ast/Module.java | 1 +
src/org/python/antlr/ast/Name.java | 1 +
src/org/python/antlr/ast/Num.java | 1 +
src/org/python/antlr/ast/Pass.java | 1 +
src/org/python/antlr/ast/Print.java | 1 +
src/org/python/antlr/ast/Raise.java | 1 +
src/org/python/antlr/ast/Repr.java | 1 +
src/org/python/antlr/ast/Return.java | 1 +
src/org/python/antlr/ast/Set.java | 1 +
src/org/python/antlr/ast/SetComp.java | 1 +
src/org/python/antlr/ast/Slice.java | 1 +
src/org/python/antlr/ast/Str.java | 1 +
src/org/python/antlr/ast/Subscript.java | 1 +
src/org/python/antlr/ast/Suite.java | 1 +
src/org/python/antlr/ast/TryExcept.java | 1 +
src/org/python/antlr/ast/TryFinally.java | 1 +
src/org/python/antlr/ast/Tuple.java | 1 +
src/org/python/antlr/ast/UnaryOp.java | 1 +
src/org/python/antlr/ast/VisitorBase.java | 1 +
src/org/python/antlr/ast/While.java | 1 +
src/org/python/antlr/ast/With.java | 1 +
src/org/python/antlr/ast/Yield.java | 1 +
src/org/python/antlr/ast/alias.java | 2 +
src/org/python/antlr/ast/arguments.java | 1 +
src/org/python/antlr/base/excepthandler.java | 1 +
src/org/python/antlr/base/expr.java | 1 +
src/org/python/antlr/base/mod.java | 1 +
src/org/python/antlr/base/slice.java | 1 +
src/org/python/antlr/base/stmt.java | 1 +
63 files changed, 185 insertions(+), 8 deletions(-)
diff --git a/ast/asdl_antlr.py b/ast/asdl_antlr.py
--- a/ast/asdl_antlr.py
+++ b/ast/asdl_antlr.py
@@ -75,6 +75,7 @@
print >> self.file, 'import org.python.core.PyString;'
print >> self.file, 'import org.python.core.PyStringMap;'
print >> self.file, 'import org.python.core.PyType;'
+ print >> self.file, 'import org.python.core.Visitproc;'
print >> self.file, 'import org.python.expose.ExposedGet;'
print >> self.file, 'import org.python.expose.ExposedMethod;'
print >> self.file, 'import org.python.expose.ExposedNew;'
@@ -641,7 +642,6 @@
return jtype
def indexerSupport(self, name, depth):
- self.emit("// Support for indexer below", depth + 1)
self.file.write(indexer_support[name])
class VisitorVisitor(EmitVisitor):
@@ -707,7 +707,8 @@
VisitorVisitor(outdir))
c.visit(mod)
-indexer_support = {"Attribute": """
+indexer_support = {"Attribute": """ // Support for indexer below
+
private Name attrName;
public Name getInternalAttrName() {
return attrName;
@@ -729,9 +730,11 @@
this.attrName = attr;
this.ctx = ctx;
}
+ // End indexer support
""",
-"ClassDef": """
+"ClassDef": """ // Support for indexer below
+
private Name nameNode;
public Name getInternalNameNode() {
return nameNode;
@@ -763,9 +766,11 @@
addChild(t);
}
}
+ // End indexer support
""",
-"FunctionDef": """
+"FunctionDef": """ // Support for indexer below
+
private Name nameNode;
public Name getInternalNameNode() {
return nameNode;
@@ -791,9 +796,11 @@
addChild(t);
}
}
+ // End indexer support
""",
-"Global": """
+"Global": """ // Support for indexer below
+
private java.util.List<Name> nameNodes;
public java.util.List<Name> getInternalNameNodes() {
return nameNodes;
@@ -803,9 +810,11 @@
this.names = names;
this.nameNodes = nameNodes;
}
+ // End indexer support
""",
-"ImportFrom": """
+"ImportFrom": """ // Support for indexer below
+
private java.util.List<Name> moduleNames;
public java.util.List<Name> getInternalModuleNames() {
return moduleNames;
@@ -831,9 +840,11 @@
}
this.level = level;
}
+ // End indexer support
""",
-"alias": """
+"alias": """ // Support for indexer below
+
private java.util.List<Name> nameNodes;
public java.util.List<Name> getInternalNameNodes() {
return nameNodes;
@@ -856,9 +867,11 @@
this.asname = asname.getInternalId();
}
}
+ // End indexer support
""",
-"arguments": """
+"arguments": """ // Support for indexer below
+
private Name varargName;
public Name getInternalVarargName() {
return varargName;
@@ -892,8 +905,104 @@
addChild(t);
}
}
+ // End indexer support
+
+
+ /* Traverseproc implementation */
+ @Override
+ public int traverse(Visitproc visit, Object arg) {
+ int retVal = super.traverse(visit, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ if (args != null) {
+ for (PyObject ob: args) {
+ if (ob != null) {
+ retVal = visit.visit(ob, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ }
+ }
+ }
+ if (defaults != null) {
+ for (PyObject ob: defaults) {
+ if (ob != null) {
+ retVal = visit.visit(ob, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ }
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public boolean refersDirectlyTo(PyObject ob) {
+ if (ob == null) {
+ return false;
+ } else if (args != null && args.contains(ob)) {
+ return true;
+ } else if (defaults != null && defaults.contains(ob)) {
+ return true;
+ } else {
+ return super.refersDirectlyTo(ob);
+ }
+ }
""",
+"keyword": """
+ /* Traverseproc implementation */
+ @Override
+ public int traverse(Visitproc visit, Object arg) {
+ return value != null ? visit.visit(value, arg) : 0;
+ }
+
+ @Override
+ public boolean refersDirectlyTo(PyObject ob) {
+ return ob != null && (ob == value || super.refersDirectlyTo(ob));
+ }
+""",
+"comprehension": """
+ /* Traverseproc implementation */
+ @Override
+ public int traverse(Visitproc visit, Object arg) {
+ int retVal = super.traverse(visit, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ if (iter != null) {
+ retVal = visit.visit(iter, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ }
+ if (ifs != null) {
+ for (PyObject ob: ifs) {
+ if (ob != null) {
+ retVal = visit.visit(ob, arg);
+ if (retVal != 0) {
+ return retVal;
+ }
+ }
+ }
+ }
+
+ return target != null ? visit.visit(target, arg) : 0;
+ }
+
+ @Override
+ public boolean refersDirectlyTo(PyObject ob) {
+ if (ob == null) {
+ return false;
+ } else if (ifs != null && ifs.contains(ob)) {
+ return true;
+ } else {
+ return ob == iter || ob == target || super.refersDirectlyTo(ob);
+ }
+ }
+""",
}
if __name__ == "__main__":
diff --git a/src/org/python/antlr/ast/Assert.java b/src/org/python/antlr/ast/Assert.java
--- a/src/org/python/antlr/ast/Assert.java
+++ b/src/org/python/antlr/ast/Assert.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Assign.java b/src/org/python/antlr/ast/Assign.java
--- a/src/org/python/antlr/ast/Assign.java
+++ b/src/org/python/antlr/ast/Assign.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Attribute.java b/src/org/python/antlr/ast/Attribute.java
--- a/src/org/python/antlr/ast/Attribute.java
+++ b/src/org/python/antlr/ast/Attribute.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -239,4 +240,5 @@
this.attrName = attr;
this.ctx = ctx;
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/AugAssign.java b/src/org/python/antlr/ast/AugAssign.java
--- a/src/org/python/antlr/ast/AugAssign.java
+++ b/src/org/python/antlr/ast/AugAssign.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/BinOp.java b/src/org/python/antlr/ast/BinOp.java
--- a/src/org/python/antlr/ast/BinOp.java
+++ b/src/org/python/antlr/ast/BinOp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/BoolOp.java b/src/org/python/antlr/ast/BoolOp.java
--- a/src/org/python/antlr/ast/BoolOp.java
+++ b/src/org/python/antlr/ast/BoolOp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Break.java b/src/org/python/antlr/ast/Break.java
--- a/src/org/python/antlr/ast/Break.java
+++ b/src/org/python/antlr/ast/Break.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Call.java b/src/org/python/antlr/ast/Call.java
--- a/src/org/python/antlr/ast/Call.java
+++ b/src/org/python/antlr/ast/Call.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/ClassDef.java b/src/org/python/antlr/ast/ClassDef.java
--- a/src/org/python/antlr/ast/ClassDef.java
+++ b/src/org/python/antlr/ast/ClassDef.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -337,4 +338,5 @@
addChild(t);
}
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/Compare.java b/src/org/python/antlr/ast/Compare.java
--- a/src/org/python/antlr/ast/Compare.java
+++ b/src/org/python/antlr/ast/Compare.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Continue.java b/src/org/python/antlr/ast/Continue.java
--- a/src/org/python/antlr/ast/Continue.java
+++ b/src/org/python/antlr/ast/Continue.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Delete.java b/src/org/python/antlr/ast/Delete.java
--- a/src/org/python/antlr/ast/Delete.java
+++ b/src/org/python/antlr/ast/Delete.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Dict.java b/src/org/python/antlr/ast/Dict.java
--- a/src/org/python/antlr/ast/Dict.java
+++ b/src/org/python/antlr/ast/Dict.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/DictComp.java b/src/org/python/antlr/ast/DictComp.java
--- a/src/org/python/antlr/ast/DictComp.java
+++ b/src/org/python/antlr/ast/DictComp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Ellipsis.java b/src/org/python/antlr/ast/Ellipsis.java
--- a/src/org/python/antlr/ast/Ellipsis.java
+++ b/src/org/python/antlr/ast/Ellipsis.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/ExceptHandler.java b/src/org/python/antlr/ast/ExceptHandler.java
--- a/src/org/python/antlr/ast/ExceptHandler.java
+++ b/src/org/python/antlr/ast/ExceptHandler.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Exec.java b/src/org/python/antlr/ast/Exec.java
--- a/src/org/python/antlr/ast/Exec.java
+++ b/src/org/python/antlr/ast/Exec.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Expr.java b/src/org/python/antlr/ast/Expr.java
--- a/src/org/python/antlr/ast/Expr.java
+++ b/src/org/python/antlr/ast/Expr.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Expression.java b/src/org/python/antlr/ast/Expression.java
--- a/src/org/python/antlr/ast/Expression.java
+++ b/src/org/python/antlr/ast/Expression.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/ExtSlice.java b/src/org/python/antlr/ast/ExtSlice.java
--- a/src/org/python/antlr/ast/ExtSlice.java
+++ b/src/org/python/antlr/ast/ExtSlice.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/For.java b/src/org/python/antlr/ast/For.java
--- a/src/org/python/antlr/ast/For.java
+++ b/src/org/python/antlr/ast/For.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/FunctionDef.java b/src/org/python/antlr/ast/FunctionDef.java
--- a/src/org/python/antlr/ast/FunctionDef.java
+++ b/src/org/python/antlr/ast/FunctionDef.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -309,4 +310,5 @@
addChild(t);
}
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/GeneratorExp.java b/src/org/python/antlr/ast/GeneratorExp.java
--- a/src/org/python/antlr/ast/GeneratorExp.java
+++ b/src/org/python/antlr/ast/GeneratorExp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Global.java b/src/org/python/antlr/ast/Global.java
--- a/src/org/python/antlr/ast/Global.java
+++ b/src/org/python/antlr/ast/Global.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -175,4 +176,5 @@
this.names = names;
this.nameNodes = nameNodes;
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/If.java b/src/org/python/antlr/ast/If.java
--- a/src/org/python/antlr/ast/If.java
+++ b/src/org/python/antlr/ast/If.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/IfExp.java b/src/org/python/antlr/ast/IfExp.java
--- a/src/org/python/antlr/ast/IfExp.java
+++ b/src/org/python/antlr/ast/IfExp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Import.java b/src/org/python/antlr/ast/Import.java
--- a/src/org/python/antlr/ast/Import.java
+++ b/src/org/python/antlr/ast/Import.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/ImportFrom.java b/src/org/python/antlr/ast/ImportFrom.java
--- a/src/org/python/antlr/ast/ImportFrom.java
+++ b/src/org/python/antlr/ast/ImportFrom.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -259,4 +260,5 @@
}
this.level = level;
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/Index.java b/src/org/python/antlr/ast/Index.java
--- a/src/org/python/antlr/ast/Index.java
+++ b/src/org/python/antlr/ast/Index.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Interactive.java b/src/org/python/antlr/ast/Interactive.java
--- a/src/org/python/antlr/ast/Interactive.java
+++ b/src/org/python/antlr/ast/Interactive.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Lambda.java b/src/org/python/antlr/ast/Lambda.java
--- a/src/org/python/antlr/ast/Lambda.java
+++ b/src/org/python/antlr/ast/Lambda.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/List.java b/src/org/python/antlr/ast/List.java
--- a/src/org/python/antlr/ast/List.java
+++ b/src/org/python/antlr/ast/List.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/ListComp.java b/src/org/python/antlr/ast/ListComp.java
--- a/src/org/python/antlr/ast/ListComp.java
+++ b/src/org/python/antlr/ast/ListComp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Module.java b/src/org/python/antlr/ast/Module.java
--- a/src/org/python/antlr/ast/Module.java
+++ b/src/org/python/antlr/ast/Module.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Name.java b/src/org/python/antlr/ast/Name.java
--- a/src/org/python/antlr/ast/Name.java
+++ b/src/org/python/antlr/ast/Name.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Num.java b/src/org/python/antlr/ast/Num.java
--- a/src/org/python/antlr/ast/Num.java
+++ b/src/org/python/antlr/ast/Num.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Pass.java b/src/org/python/antlr/ast/Pass.java
--- a/src/org/python/antlr/ast/Pass.java
+++ b/src/org/python/antlr/ast/Pass.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Print.java b/src/org/python/antlr/ast/Print.java
--- a/src/org/python/antlr/ast/Print.java
+++ b/src/org/python/antlr/ast/Print.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Raise.java b/src/org/python/antlr/ast/Raise.java
--- a/src/org/python/antlr/ast/Raise.java
+++ b/src/org/python/antlr/ast/Raise.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Repr.java b/src/org/python/antlr/ast/Repr.java
--- a/src/org/python/antlr/ast/Repr.java
+++ b/src/org/python/antlr/ast/Repr.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Return.java b/src/org/python/antlr/ast/Return.java
--- a/src/org/python/antlr/ast/Return.java
+++ b/src/org/python/antlr/ast/Return.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Set.java b/src/org/python/antlr/ast/Set.java
--- a/src/org/python/antlr/ast/Set.java
+++ b/src/org/python/antlr/ast/Set.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/SetComp.java b/src/org/python/antlr/ast/SetComp.java
--- a/src/org/python/antlr/ast/SetComp.java
+++ b/src/org/python/antlr/ast/SetComp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Slice.java b/src/org/python/antlr/ast/Slice.java
--- a/src/org/python/antlr/ast/Slice.java
+++ b/src/org/python/antlr/ast/Slice.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Str.java b/src/org/python/antlr/ast/Str.java
--- a/src/org/python/antlr/ast/Str.java
+++ b/src/org/python/antlr/ast/Str.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Subscript.java b/src/org/python/antlr/ast/Subscript.java
--- a/src/org/python/antlr/ast/Subscript.java
+++ b/src/org/python/antlr/ast/Subscript.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Suite.java b/src/org/python/antlr/ast/Suite.java
--- a/src/org/python/antlr/ast/Suite.java
+++ b/src/org/python/antlr/ast/Suite.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/TryExcept.java b/src/org/python/antlr/ast/TryExcept.java
--- a/src/org/python/antlr/ast/TryExcept.java
+++ b/src/org/python/antlr/ast/TryExcept.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/TryFinally.java b/src/org/python/antlr/ast/TryFinally.java
--- a/src/org/python/antlr/ast/TryFinally.java
+++ b/src/org/python/antlr/ast/TryFinally.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Tuple.java b/src/org/python/antlr/ast/Tuple.java
--- a/src/org/python/antlr/ast/Tuple.java
+++ b/src/org/python/antlr/ast/Tuple.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/UnaryOp.java b/src/org/python/antlr/ast/UnaryOp.java
--- a/src/org/python/antlr/ast/UnaryOp.java
+++ b/src/org/python/antlr/ast/UnaryOp.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/VisitorBase.java b/src/org/python/antlr/ast/VisitorBase.java
--- a/src/org/python/antlr/ast/VisitorBase.java
+++ b/src/org/python/antlr/ast/VisitorBase.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/While.java b/src/org/python/antlr/ast/While.java
--- a/src/org/python/antlr/ast/While.java
+++ b/src/org/python/antlr/ast/While.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/With.java b/src/org/python/antlr/ast/With.java
--- a/src/org/python/antlr/ast/With.java
+++ b/src/org/python/antlr/ast/With.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/Yield.java b/src/org/python/antlr/ast/Yield.java
--- a/src/org/python/antlr/ast/Yield.java
+++ b/src/org/python/antlr/ast/Yield.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/ast/alias.java b/src/org/python/antlr/ast/alias.java
--- a/src/org/python/antlr/ast/alias.java
+++ b/src/org/python/antlr/ast/alias.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
@@ -173,4 +174,5 @@
this.asname = asname.getInternalId();
}
}
+ // End indexer support
}
diff --git a/src/org/python/antlr/ast/arguments.java b/src/org/python/antlr/ast/arguments.java
--- a/src/org/python/antlr/ast/arguments.java
+++ b/src/org/python/antlr/ast/arguments.java
@@ -279,6 +279,7 @@
addChild(t);
}
}
+ // End indexer support
/* Traverseproc implementation */
diff --git a/src/org/python/antlr/base/excepthandler.java b/src/org/python/antlr/base/excepthandler.java
--- a/src/org/python/antlr/base/excepthandler.java
+++ b/src/org/python/antlr/base/excepthandler.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/base/expr.java b/src/org/python/antlr/base/expr.java
--- a/src/org/python/antlr/base/expr.java
+++ b/src/org/python/antlr/base/expr.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/base/mod.java b/src/org/python/antlr/base/mod.java
--- a/src/org/python/antlr/base/mod.java
+++ b/src/org/python/antlr/base/mod.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/base/slice.java b/src/org/python/antlr/base/slice.java
--- a/src/org/python/antlr/base/slice.java
+++ b/src/org/python/antlr/base/slice.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
diff --git a/src/org/python/antlr/base/stmt.java b/src/org/python/antlr/base/stmt.java
--- a/src/org/python/antlr/base/stmt.java
+++ b/src/org/python/antlr/base/stmt.java
@@ -17,6 +17,7 @@
import org.python.core.PyString;
import org.python.core.PyStringMap;
import org.python.core.PyType;
+import org.python.core.Visitproc;
import org.python.expose.ExposedGet;
import org.python.expose.ExposedMethod;
import org.python.expose.ExposedNew;
--
Repository URL: https://hg.python.org/jython
More information about the Jython-checkins
mailing list