[Jython-checkins] jython: Better base classes for ast.
frank.wierzbicki
jython-checkins at python.org
Sat May 17 22:32:34 CEST 2014
http://hg.python.org/jython/rev/213e1d9d051e
changeset: 7252:213e1d9d051e
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Fri May 16 22:50:27 2014 +0000
summary:
Better base classes for ast.
files:
ast/asdl_antlr.py | 3 ++-
src/org/python/antlr/ast/Assert.java | 2 +-
src/org/python/antlr/ast/Assign.java | 2 +-
src/org/python/antlr/ast/Attribute.java | 2 +-
src/org/python/antlr/ast/AugAssign.java | 2 +-
src/org/python/antlr/ast/BinOp.java | 2 +-
src/org/python/antlr/ast/BoolOp.java | 2 +-
src/org/python/antlr/ast/Break.java | 2 +-
src/org/python/antlr/ast/Call.java | 2 +-
src/org/python/antlr/ast/ClassDef.java | 2 +-
src/org/python/antlr/ast/Compare.java | 2 +-
src/org/python/antlr/ast/Continue.java | 2 +-
src/org/python/antlr/ast/Delete.java | 2 +-
src/org/python/antlr/ast/Dict.java | 2 +-
src/org/python/antlr/ast/DictComp.java | 2 +-
src/org/python/antlr/ast/Ellipsis.java | 2 +-
src/org/python/antlr/ast/ExceptHandler.java | 2 +-
src/org/python/antlr/ast/Exec.java | 2 +-
src/org/python/antlr/ast/Expr.java | 2 +-
src/org/python/antlr/ast/Expression.java | 2 +-
src/org/python/antlr/ast/ExtSlice.java | 2 +-
src/org/python/antlr/ast/For.java | 2 +-
src/org/python/antlr/ast/FunctionDef.java | 2 +-
src/org/python/antlr/ast/GeneratorExp.java | 2 +-
src/org/python/antlr/ast/Global.java | 2 +-
src/org/python/antlr/ast/If.java | 2 +-
src/org/python/antlr/ast/IfExp.java | 2 +-
src/org/python/antlr/ast/Import.java | 2 +-
src/org/python/antlr/ast/ImportFrom.java | 2 +-
src/org/python/antlr/ast/Index.java | 2 +-
src/org/python/antlr/ast/Interactive.java | 2 +-
src/org/python/antlr/ast/Lambda.java | 2 +-
src/org/python/antlr/ast/List.java | 2 +-
src/org/python/antlr/ast/ListComp.java | 2 +-
src/org/python/antlr/ast/Module.java | 2 +-
src/org/python/antlr/ast/Name.java | 2 +-
src/org/python/antlr/ast/Num.java | 2 +-
src/org/python/antlr/ast/Pass.java | 2 +-
src/org/python/antlr/ast/Print.java | 2 +-
src/org/python/antlr/ast/Raise.java | 2 +-
src/org/python/antlr/ast/Repr.java | 2 +-
src/org/python/antlr/ast/Return.java | 2 +-
src/org/python/antlr/ast/Set.java | 2 +-
src/org/python/antlr/ast/SetComp.java | 2 +-
src/org/python/antlr/ast/Slice.java | 2 +-
src/org/python/antlr/ast/Str.java | 2 +-
src/org/python/antlr/ast/Subscript.java | 2 +-
src/org/python/antlr/ast/Suite.java | 2 +-
src/org/python/antlr/ast/TryExcept.java | 2 +-
src/org/python/antlr/ast/TryFinally.java | 2 +-
src/org/python/antlr/ast/Tuple.java | 2 +-
src/org/python/antlr/ast/UnaryOp.java | 2 +-
src/org/python/antlr/ast/While.java | 2 +-
src/org/python/antlr/ast/With.java | 2 +-
src/org/python/antlr/ast/Yield.java | 2 +-
src/org/python/antlr/op/Add.java | 1 +
src/org/python/antlr/op/And.java | 1 +
src/org/python/antlr/op/AugLoad.java | 1 +
src/org/python/antlr/op/AugStore.java | 1 +
src/org/python/antlr/op/BitAnd.java | 1 +
src/org/python/antlr/op/BitOr.java | 1 +
src/org/python/antlr/op/BitXor.java | 1 +
src/org/python/antlr/op/Del.java | 1 +
src/org/python/antlr/op/Div.java | 1 +
src/org/python/antlr/op/Eq.java | 1 +
src/org/python/antlr/op/FloorDiv.java | 1 +
src/org/python/antlr/op/Gt.java | 1 +
src/org/python/antlr/op/GtE.java | 1 +
src/org/python/antlr/op/In.java | 1 +
src/org/python/antlr/op/Invert.java | 1 +
src/org/python/antlr/op/Is.java | 1 +
src/org/python/antlr/op/IsNot.java | 1 +
src/org/python/antlr/op/LShift.java | 1 +
src/org/python/antlr/op/Load.java | 1 +
src/org/python/antlr/op/Lt.java | 1 +
src/org/python/antlr/op/LtE.java | 1 +
src/org/python/antlr/op/Mod.java | 1 +
src/org/python/antlr/op/Mult.java | 1 +
src/org/python/antlr/op/Not.java | 1 +
src/org/python/antlr/op/NotEq.java | 1 +
src/org/python/antlr/op/NotIn.java | 1 +
src/org/python/antlr/op/Or.java | 1 +
src/org/python/antlr/op/Param.java | 1 +
src/org/python/antlr/op/Pow.java | 1 +
src/org/python/antlr/op/RShift.java | 1 +
src/org/python/antlr/op/Store.java | 1 +
src/org/python/antlr/op/Sub.java | 1 +
src/org/python/antlr/op/UAdd.java | 1 +
src/org/python/antlr/op/USub.java | 1 +
89 files changed, 90 insertions(+), 55 deletions(-)
diff --git a/ast/asdl_antlr.py b/ast/asdl_antlr.py
--- a/ast/asdl_antlr.py
+++ b/ast/asdl_antlr.py
@@ -180,6 +180,7 @@
type = sum.types[i]
self.open("op", type.name, refersToPythonTree=0)
self.emit('import org.python.antlr.AST;', depth)
+ self.emit('import org.python.antlr.ast.%sType;' % name, depth)
self.emit('import org.python.antlr.PythonTree;', depth)
self.emit('import org.python.core.Py;', depth)
self.emit('import org.python.core.PyObject;', depth)
@@ -328,7 +329,7 @@
s = "implements %s " % ", ".join(ifaces)
else:
s = ""
- self.emit('@ExposedType(name = "_ast.%s", base = AST.class)' % cons.name, depth);
+ self.emit('@ExposedType(name = "_ast.%s", base = %s.class)' % (cons.name, name), depth);
self.emit("public class %s extends %s %s{" %
(cons.name, name, s), depth)
self.emit("public static final PyType TYPE = PyType.fromClass(%s.class);" % cons.name, depth);
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Assert", base = AST.class)
+ at ExposedType(name = "_ast.Assert", base = stmt.class)
public class Assert extends stmt {
public static final PyType TYPE = PyType.fromClass(Assert.class);
private expr test;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Assign", base = AST.class)
+ at ExposedType(name = "_ast.Assign", base = stmt.class)
public class Assign extends stmt {
public static final PyType TYPE = PyType.fromClass(Assign.class);
private java.util.List<expr> targets;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Attribute", base = AST.class)
+ at ExposedType(name = "_ast.Attribute", base = expr.class)
public class Attribute extends expr implements Context {
public static final PyType TYPE = PyType.fromClass(Attribute.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.AugAssign", base = AST.class)
+ at ExposedType(name = "_ast.AugAssign", base = stmt.class)
public class AugAssign extends stmt {
public static final PyType TYPE = PyType.fromClass(AugAssign.class);
private expr target;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.BinOp", base = AST.class)
+ at ExposedType(name = "_ast.BinOp", base = expr.class)
public class BinOp extends expr {
public static final PyType TYPE = PyType.fromClass(BinOp.class);
private expr left;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.BoolOp", base = AST.class)
+ at ExposedType(name = "_ast.BoolOp", base = expr.class)
public class BoolOp extends expr {
public static final PyType TYPE = PyType.fromClass(BoolOp.class);
private boolopType op;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Break", base = AST.class)
+ at ExposedType(name = "_ast.Break", base = stmt.class)
public class Break extends stmt {
public static final PyType TYPE = PyType.fromClass(Break.class);
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Call", base = AST.class)
+ at ExposedType(name = "_ast.Call", base = expr.class)
public class Call extends expr {
public static final PyType TYPE = PyType.fromClass(Call.class);
private expr func;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.ClassDef", base = AST.class)
+ at ExposedType(name = "_ast.ClassDef", base = stmt.class)
public class ClassDef extends stmt {
public static final PyType TYPE = PyType.fromClass(ClassDef.class);
private String name;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Compare", base = AST.class)
+ at ExposedType(name = "_ast.Compare", base = expr.class)
public class Compare extends expr {
public static final PyType TYPE = PyType.fromClass(Compare.class);
private expr left;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Continue", base = AST.class)
+ at ExposedType(name = "_ast.Continue", base = stmt.class)
public class Continue extends stmt {
public static final PyType TYPE = PyType.fromClass(Continue.class);
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Delete", base = AST.class)
+ at ExposedType(name = "_ast.Delete", base = stmt.class)
public class Delete extends stmt {
public static final PyType TYPE = PyType.fromClass(Delete.class);
private java.util.List<expr> targets;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Dict", base = AST.class)
+ at ExposedType(name = "_ast.Dict", base = expr.class)
public class Dict extends expr {
public static final PyType TYPE = PyType.fromClass(Dict.class);
private java.util.List<expr> keys;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.DictComp", base = AST.class)
+ at ExposedType(name = "_ast.DictComp", base = expr.class)
public class DictComp extends expr {
public static final PyType TYPE = PyType.fromClass(DictComp.class);
private expr key;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Ellipsis", base = AST.class)
+ at ExposedType(name = "_ast.Ellipsis", base = slice.class)
public class Ellipsis extends slice {
public static final PyType TYPE = PyType.fromClass(Ellipsis.class);
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.ExceptHandler", base = AST.class)
+ at ExposedType(name = "_ast.ExceptHandler", base = excepthandler.class)
public class ExceptHandler extends excepthandler {
public static final PyType TYPE = PyType.fromClass(ExceptHandler.class);
private expr type;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Exec", base = AST.class)
+ at ExposedType(name = "_ast.Exec", base = stmt.class)
public class Exec extends stmt {
public static final PyType TYPE = PyType.fromClass(Exec.class);
private expr body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Expr", base = AST.class)
+ at ExposedType(name = "_ast.Expr", base = stmt.class)
public class Expr extends stmt {
public static final PyType TYPE = PyType.fromClass(Expr.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Expression", base = AST.class)
+ at ExposedType(name = "_ast.Expression", base = mod.class)
public class Expression extends mod {
public static final PyType TYPE = PyType.fromClass(Expression.class);
private expr body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.ExtSlice", base = AST.class)
+ at ExposedType(name = "_ast.ExtSlice", base = slice.class)
public class ExtSlice extends slice {
public static final PyType TYPE = PyType.fromClass(ExtSlice.class);
private java.util.List<slice> dims;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.For", base = AST.class)
+ at ExposedType(name = "_ast.For", base = stmt.class)
public class For extends stmt {
public static final PyType TYPE = PyType.fromClass(For.class);
private expr target;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.FunctionDef", base = AST.class)
+ at ExposedType(name = "_ast.FunctionDef", base = stmt.class)
public class FunctionDef extends stmt {
public static final PyType TYPE = PyType.fromClass(FunctionDef.class);
private String name;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.GeneratorExp", base = AST.class)
+ at ExposedType(name = "_ast.GeneratorExp", base = expr.class)
public class GeneratorExp extends expr {
public static final PyType TYPE = PyType.fromClass(GeneratorExp.class);
private expr elt;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Global", base = AST.class)
+ at ExposedType(name = "_ast.Global", base = stmt.class)
public class Global extends stmt {
public static final PyType TYPE = PyType.fromClass(Global.class);
private java.util.List<String> names;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.If", base = AST.class)
+ at ExposedType(name = "_ast.If", base = stmt.class)
public class If extends stmt {
public static final PyType TYPE = PyType.fromClass(If.class);
private expr test;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.IfExp", base = AST.class)
+ at ExposedType(name = "_ast.IfExp", base = expr.class)
public class IfExp extends expr {
public static final PyType TYPE = PyType.fromClass(IfExp.class);
private expr test;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Import", base = AST.class)
+ at ExposedType(name = "_ast.Import", base = stmt.class)
public class Import extends stmt {
public static final PyType TYPE = PyType.fromClass(Import.class);
private java.util.List<alias> names;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.ImportFrom", base = AST.class)
+ at ExposedType(name = "_ast.ImportFrom", base = stmt.class)
public class ImportFrom extends stmt {
public static final PyType TYPE = PyType.fromClass(ImportFrom.class);
private String module;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Index", base = AST.class)
+ at ExposedType(name = "_ast.Index", base = slice.class)
public class Index extends slice {
public static final PyType TYPE = PyType.fromClass(Index.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Interactive", base = AST.class)
+ at ExposedType(name = "_ast.Interactive", base = mod.class)
public class Interactive extends mod {
public static final PyType TYPE = PyType.fromClass(Interactive.class);
private java.util.List<stmt> body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Lambda", base = AST.class)
+ at ExposedType(name = "_ast.Lambda", base = expr.class)
public class Lambda extends expr {
public static final PyType TYPE = PyType.fromClass(Lambda.class);
private arguments args;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.List", base = AST.class)
+ at ExposedType(name = "_ast.List", base = expr.class)
public class List extends expr implements Context {
public static final PyType TYPE = PyType.fromClass(List.class);
private java.util.List<expr> elts;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.ListComp", base = AST.class)
+ at ExposedType(name = "_ast.ListComp", base = expr.class)
public class ListComp extends expr {
public static final PyType TYPE = PyType.fromClass(ListComp.class);
private expr elt;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Module", base = AST.class)
+ at ExposedType(name = "_ast.Module", base = mod.class)
public class Module extends mod {
public static final PyType TYPE = PyType.fromClass(Module.class);
private java.util.List<stmt> body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Name", base = AST.class)
+ at ExposedType(name = "_ast.Name", base = expr.class)
public class Name extends expr implements Context {
public static final PyType TYPE = PyType.fromClass(Name.class);
private String id;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Num", base = AST.class)
+ at ExposedType(name = "_ast.Num", base = expr.class)
public class Num extends expr {
public static final PyType TYPE = PyType.fromClass(Num.class);
private Object n;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Pass", base = AST.class)
+ at ExposedType(name = "_ast.Pass", base = stmt.class)
public class Pass extends stmt {
public static final PyType TYPE = PyType.fromClass(Pass.class);
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Print", base = AST.class)
+ at ExposedType(name = "_ast.Print", base = stmt.class)
public class Print extends stmt {
public static final PyType TYPE = PyType.fromClass(Print.class);
private expr dest;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Raise", base = AST.class)
+ at ExposedType(name = "_ast.Raise", base = stmt.class)
public class Raise extends stmt {
public static final PyType TYPE = PyType.fromClass(Raise.class);
private expr type;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Repr", base = AST.class)
+ at ExposedType(name = "_ast.Repr", base = expr.class)
public class Repr extends expr {
public static final PyType TYPE = PyType.fromClass(Repr.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Return", base = AST.class)
+ at ExposedType(name = "_ast.Return", base = stmt.class)
public class Return extends stmt {
public static final PyType TYPE = PyType.fromClass(Return.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Set", base = AST.class)
+ at ExposedType(name = "_ast.Set", base = expr.class)
public class Set extends expr {
public static final PyType TYPE = PyType.fromClass(Set.class);
private java.util.List<expr> elts;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.SetComp", base = AST.class)
+ at ExposedType(name = "_ast.SetComp", base = expr.class)
public class SetComp extends expr {
public static final PyType TYPE = PyType.fromClass(SetComp.class);
private expr elt;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Slice", base = AST.class)
+ at ExposedType(name = "_ast.Slice", base = slice.class)
public class Slice extends slice {
public static final PyType TYPE = PyType.fromClass(Slice.class);
private expr lower;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Str", base = AST.class)
+ at ExposedType(name = "_ast.Str", base = expr.class)
public class Str extends expr {
public static final PyType TYPE = PyType.fromClass(Str.class);
private Object s;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Subscript", base = AST.class)
+ at ExposedType(name = "_ast.Subscript", base = expr.class)
public class Subscript extends expr implements Context {
public static final PyType TYPE = PyType.fromClass(Subscript.class);
private expr value;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Suite", base = AST.class)
+ at ExposedType(name = "_ast.Suite", base = mod.class)
public class Suite extends mod {
public static final PyType TYPE = PyType.fromClass(Suite.class);
private java.util.List<stmt> body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.TryExcept", base = AST.class)
+ at ExposedType(name = "_ast.TryExcept", base = stmt.class)
public class TryExcept extends stmt {
public static final PyType TYPE = PyType.fromClass(TryExcept.class);
private java.util.List<stmt> body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.TryFinally", base = AST.class)
+ at ExposedType(name = "_ast.TryFinally", base = stmt.class)
public class TryFinally extends stmt {
public static final PyType TYPE = PyType.fromClass(TryFinally.class);
private java.util.List<stmt> body;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Tuple", base = AST.class)
+ at ExposedType(name = "_ast.Tuple", base = expr.class)
public class Tuple extends expr implements Context {
public static final PyType TYPE = PyType.fromClass(Tuple.class);
private java.util.List<expr> elts;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.UnaryOp", base = AST.class)
+ at ExposedType(name = "_ast.UnaryOp", base = expr.class)
public class UnaryOp extends expr {
public static final PyType TYPE = PyType.fromClass(UnaryOp.class);
private unaryopType op;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.While", base = AST.class)
+ at ExposedType(name = "_ast.While", base = stmt.class)
public class While extends stmt {
public static final PyType TYPE = PyType.fromClass(While.class);
private expr test;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.With", base = AST.class)
+ at ExposedType(name = "_ast.With", base = stmt.class)
public class With extends stmt {
public static final PyType TYPE = PyType.fromClass(With.class);
private expr context_expr;
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
@@ -26,7 +26,7 @@
import java.io.IOException;
import java.util.ArrayList;
- at ExposedType(name = "_ast.Yield", base = AST.class)
+ at ExposedType(name = "_ast.Yield", base = expr.class)
public class Yield extends expr {
public static final PyType TYPE = PyType.fromClass(Yield.class);
private expr value;
diff --git a/src/org/python/antlr/op/Add.java b/src/org/python/antlr/op/Add.java
--- a/src/org/python/antlr/op/Add.java
+++ b/src/org/python/antlr/op/Add.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/And.java b/src/org/python/antlr/op/And.java
--- a/src/org/python/antlr/op/And.java
+++ b/src/org/python/antlr/op/And.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.boolopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/AugLoad.java b/src/org/python/antlr/op/AugLoad.java
--- a/src/org/python/antlr/op/AugLoad.java
+++ b/src/org/python/antlr/op/AugLoad.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/AugStore.java b/src/org/python/antlr/op/AugStore.java
--- a/src/org/python/antlr/op/AugStore.java
+++ b/src/org/python/antlr/op/AugStore.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/BitAnd.java b/src/org/python/antlr/op/BitAnd.java
--- a/src/org/python/antlr/op/BitAnd.java
+++ b/src/org/python/antlr/op/BitAnd.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/BitOr.java b/src/org/python/antlr/op/BitOr.java
--- a/src/org/python/antlr/op/BitOr.java
+++ b/src/org/python/antlr/op/BitOr.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/BitXor.java b/src/org/python/antlr/op/BitXor.java
--- a/src/org/python/antlr/op/BitXor.java
+++ b/src/org/python/antlr/op/BitXor.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Del.java b/src/org/python/antlr/op/Del.java
--- a/src/org/python/antlr/op/Del.java
+++ b/src/org/python/antlr/op/Del.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Div.java b/src/org/python/antlr/op/Div.java
--- a/src/org/python/antlr/op/Div.java
+++ b/src/org/python/antlr/op/Div.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Eq.java b/src/org/python/antlr/op/Eq.java
--- a/src/org/python/antlr/op/Eq.java
+++ b/src/org/python/antlr/op/Eq.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/FloorDiv.java b/src/org/python/antlr/op/FloorDiv.java
--- a/src/org/python/antlr/op/FloorDiv.java
+++ b/src/org/python/antlr/op/FloorDiv.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Gt.java b/src/org/python/antlr/op/Gt.java
--- a/src/org/python/antlr/op/Gt.java
+++ b/src/org/python/antlr/op/Gt.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/GtE.java b/src/org/python/antlr/op/GtE.java
--- a/src/org/python/antlr/op/GtE.java
+++ b/src/org/python/antlr/op/GtE.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/In.java b/src/org/python/antlr/op/In.java
--- a/src/org/python/antlr/op/In.java
+++ b/src/org/python/antlr/op/In.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Invert.java b/src/org/python/antlr/op/Invert.java
--- a/src/org/python/antlr/op/Invert.java
+++ b/src/org/python/antlr/op/Invert.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.unaryopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Is.java b/src/org/python/antlr/op/Is.java
--- a/src/org/python/antlr/op/Is.java
+++ b/src/org/python/antlr/op/Is.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/IsNot.java b/src/org/python/antlr/op/IsNot.java
--- a/src/org/python/antlr/op/IsNot.java
+++ b/src/org/python/antlr/op/IsNot.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/LShift.java b/src/org/python/antlr/op/LShift.java
--- a/src/org/python/antlr/op/LShift.java
+++ b/src/org/python/antlr/op/LShift.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Load.java b/src/org/python/antlr/op/Load.java
--- a/src/org/python/antlr/op/Load.java
+++ b/src/org/python/antlr/op/Load.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Lt.java b/src/org/python/antlr/op/Lt.java
--- a/src/org/python/antlr/op/Lt.java
+++ b/src/org/python/antlr/op/Lt.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/LtE.java b/src/org/python/antlr/op/LtE.java
--- a/src/org/python/antlr/op/LtE.java
+++ b/src/org/python/antlr/op/LtE.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Mod.java b/src/org/python/antlr/op/Mod.java
--- a/src/org/python/antlr/op/Mod.java
+++ b/src/org/python/antlr/op/Mod.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Mult.java b/src/org/python/antlr/op/Mult.java
--- a/src/org/python/antlr/op/Mult.java
+++ b/src/org/python/antlr/op/Mult.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Not.java b/src/org/python/antlr/op/Not.java
--- a/src/org/python/antlr/op/Not.java
+++ b/src/org/python/antlr/op/Not.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.unaryopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/NotEq.java b/src/org/python/antlr/op/NotEq.java
--- a/src/org/python/antlr/op/NotEq.java
+++ b/src/org/python/antlr/op/NotEq.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/NotIn.java b/src/org/python/antlr/op/NotIn.java
--- a/src/org/python/antlr/op/NotIn.java
+++ b/src/org/python/antlr/op/NotIn.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.cmpopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Or.java b/src/org/python/antlr/op/Or.java
--- a/src/org/python/antlr/op/Or.java
+++ b/src/org/python/antlr/op/Or.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.boolopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Param.java b/src/org/python/antlr/op/Param.java
--- a/src/org/python/antlr/op/Param.java
+++ b/src/org/python/antlr/op/Param.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Pow.java b/src/org/python/antlr/op/Pow.java
--- a/src/org/python/antlr/op/Pow.java
+++ b/src/org/python/antlr/op/Pow.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/RShift.java b/src/org/python/antlr/op/RShift.java
--- a/src/org/python/antlr/op/RShift.java
+++ b/src/org/python/antlr/op/RShift.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Store.java b/src/org/python/antlr/op/Store.java
--- a/src/org/python/antlr/op/Store.java
+++ b/src/org/python/antlr/op/Store.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.expr_contextType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/Sub.java b/src/org/python/antlr/op/Sub.java
--- a/src/org/python/antlr/op/Sub.java
+++ b/src/org/python/antlr/op/Sub.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.operatorType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/UAdd.java b/src/org/python/antlr/op/UAdd.java
--- a/src/org/python/antlr/op/UAdd.java
+++ b/src/org/python/antlr/op/UAdd.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.unaryopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
diff --git a/src/org/python/antlr/op/USub.java b/src/org/python/antlr/op/USub.java
--- a/src/org/python/antlr/op/USub.java
+++ b/src/org/python/antlr/op/USub.java
@@ -2,6 +2,7 @@
package org.python.antlr.op;
import org.python.antlr.AST;
+import org.python.antlr.ast.unaryopType;
import org.python.antlr.PythonTree;
import org.python.core.Py;
import org.python.core.PyObject;
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list