[Jython-checkins] jython: #1497 ast classes now have appropriate base classes.

frank.wierzbicki jython-checkins at python.org
Sat May 17 22:32:35 CEST 2014 

http://hg.python.org/jython/rev/b3f5c51c0a83
changeset:   7253:b3f5c51c0a83
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Sat May 17 20:32:23 2014 +0000
summary:
  #1497 ast classes now have appropriate base classes.

files:
  CoreExposed.includes                    |   5 ++++
  NEWS                                    |   3 ++
  ast/asdl_antlr.py                       |   4 +-
  src/org/python/antlr/ast/AstModule.java |  16 ++++--------
  src/org/python/antlr/op/Add.java        |   4 +-
  src/org/python/antlr/op/And.java        |   4 +-
  src/org/python/antlr/op/AugLoad.java    |   4 +-
  src/org/python/antlr/op/AugStore.java   |   4 +-
  src/org/python/antlr/op/BitAnd.java     |   4 +-
  src/org/python/antlr/op/BitOr.java      |   4 +-
  src/org/python/antlr/op/BitXor.java     |   4 +-
  src/org/python/antlr/op/Del.java        |   4 +-
  src/org/python/antlr/op/Div.java        |   4 +-
  src/org/python/antlr/op/Eq.java         |   4 +-
  src/org/python/antlr/op/FloorDiv.java   |   4 +-
  src/org/python/antlr/op/Gt.java         |   4 +-
  src/org/python/antlr/op/GtE.java        |   4 +-
  src/org/python/antlr/op/In.java         |   4 +-
  src/org/python/antlr/op/Invert.java     |   4 +-
  src/org/python/antlr/op/Is.java         |   4 +-
  src/org/python/antlr/op/IsNot.java      |   4 +-
  src/org/python/antlr/op/LShift.java     |   4 +-
  src/org/python/antlr/op/Load.java       |   4 +-
  src/org/python/antlr/op/Lt.java         |   4 +-
  src/org/python/antlr/op/LtE.java        |   4 +-
  src/org/python/antlr/op/Mod.java        |   4 +-
  src/org/python/antlr/op/Mult.java       |   4 +-
  src/org/python/antlr/op/Not.java        |   4 +-
  src/org/python/antlr/op/NotEq.java      |   4 +-
  src/org/python/antlr/op/NotIn.java      |   4 +-
  src/org/python/antlr/op/Or.java         |   4 +-
  src/org/python/antlr/op/Param.java      |   4 +-
  src/org/python/antlr/op/Pow.java        |   4 +-
  src/org/python/antlr/op/RShift.java     |   4 +-
  src/org/python/antlr/op/Store.java      |   4 +-
  src/org/python/antlr/op/Sub.java        |   4 +-
  src/org/python/antlr/op/UAdd.java       |   4 +-
  src/org/python/antlr/op/USub.java       |   4 +-
  38 files changed, 84 insertions(+), 80 deletions(-)


diff --git a/CoreExposed.includes b/CoreExposed.includes
--- a/CoreExposed.includes
+++ b/CoreExposed.includes
@@ -172,11 +172,16 @@
 org/python/antlr/ast/While.class
 org/python/antlr/ast/With.class
 org/python/antlr/ast/Yield.class
+org/python/antlr/base/boolop.class
+org/python/antlr/base/cmpop.class
 org/python/antlr/base/excepthandler.class
 org/python/antlr/base/expr.class
+org/python/antlr/base/expr_context.class
 org/python/antlr/base/mod.class
+org/python/antlr/base/operator.class
 org/python/antlr/base/slice.class
 org/python/antlr/base/stmt.class
+org/python/antlr/base/unaryop.class
 org/python/antlr/op/Add.class
 org/python/antlr/op/And.class
 org/python/antlr/op/AugLoad.class
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@
 Jython 2.7b3
   Bugs Fixed
     - [ 2108 ] Cannot set attribute to instances of AST/PythonTree (blocks pyflakes)
+    - [ 1497 ] ast classes do not have appropiate base classes
+    - [ 1980 ] ast.Eq, ast.Gt, ast.GtE, ast.In, ast.Is, ast.IsNot, ast.Lt, ast.LtE, ast.NotEq and ast.NotIn should be subclasses of ast.cmpop
+    - [ 1981 ] ast.And and ast.Or should be subclasses of ast.boolop
   New Features
     - [ 1896215 ] findResource(s) for SyspathJavaLoader
 
diff --git a/ast/asdl_antlr.py b/ast/asdl_antlr.py
--- a/ast/asdl_antlr.py
+++ b/ast/asdl_antlr.py
@@ -180,7 +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.base.%s;' % 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)
@@ -193,7 +193,7 @@
             self.emit('import org.python.expose.ExposedType;', depth)
             self.emit('', 0)
 
-            self.emit('@ExposedType(name = "_ast.%s", base = AST.class)' % type.name, depth)
+            self.emit('@ExposedType(name = "_ast.%s", base = %s.class)' % (type.name, name), depth)
             self.emit("public class %s extends PythonTree {" % type.name, depth)
             self.emit('public static final PyType TYPE = PyType.fromClass(%s.class);' % type.name, depth + 1)
             self.emit('', 0)
diff --git a/src/org/python/antlr/ast/AstModule.java b/src/org/python/antlr/ast/AstModule.java
--- a/src/org/python/antlr/ast/AstModule.java
+++ b/src/org/python/antlr/ast/AstModule.java
@@ -1,10 +1,6 @@
 package org.python.antlr.ast;
 
-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.antlr.base.*;
 import org.python.antlr.op.*;
 import org.python.core.AstList;
 import org.python.core.ClassDictInit;
@@ -99,7 +95,7 @@
         dict.__setitem__("slice", slice.TYPE);
         dict.__setitem__("stmt", stmt.TYPE);
         
-        dict.__setitem__("operator", imp.importName("org.python.antlr.ast.operatorType", false));
+        dict.__setitem__("operator", operator.TYPE);
         dict.__setitem__("Add", Add.TYPE);
         dict.__setitem__("Sub", Sub.TYPE);
         dict.__setitem__("Mult", Mult.TYPE);
@@ -113,11 +109,11 @@
         dict.__setitem__("BitXor", BitXor.TYPE);
         dict.__setitem__("Pow", Pow.TYPE);
        
-        dict.__setitem__("boolop", imp.importName("org.python.antlr.ast.boolopType", false));
+        dict.__setitem__("boolop", boolop.TYPE);
         dict.__setitem__("And", And.TYPE);
         dict.__setitem__("Or", Or.TYPE);
       
-        dict.__setitem__("cmpop", imp.importName("org.python.antlr.ast.cmpopType", false));
+        dict.__setitem__("cmpop", cmpop.TYPE);
         dict.__setitem__("Eq", Eq.TYPE);
         dict.__setitem__("Gt", Gt.TYPE);
         dict.__setitem__("GtE", GtE.TYPE);
@@ -129,7 +125,7 @@
         dict.__setitem__("NotEq", NotEq.TYPE);
         dict.__setitem__("NotIn", NotIn.TYPE);
        
-        dict.__setitem__("expr_context", imp.importName("org.python.antlr.ast.expr_contextType", false));
+        dict.__setitem__("expr_context", expr_context.TYPE);
         dict.__setitem__("Load", Load.TYPE);
         dict.__setitem__("Store", Store.TYPE);
         dict.__setitem__("Del", Del.TYPE);
@@ -137,7 +133,7 @@
         dict.__setitem__("AugStore", AugStore.TYPE);
         dict.__setitem__("Param", Param.TYPE);
        
-        dict.__setitem__("unaryop", imp.importName("org.python.antlr.ast.unaryopType", false));
+        dict.__setitem__("unaryop", unaryop.TYPE);
         dict.__setitem__("Invert", Invert.TYPE);
         dict.__setitem__("Not", Not.TYPE);
         dict.__setitem__("UAdd", UAdd.TYPE);
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Add", base = AST.class)
+ at ExposedType(name = "_ast.Add", base = operator.class)
 public class Add extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Add.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.boolopType;
+import org.python.antlr.base.boolop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.And", base = AST.class)
+ at ExposedType(name = "_ast.And", base = boolop.class)
 public class And extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(And.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.AugLoad", base = AST.class)
+ at ExposedType(name = "_ast.AugLoad", base = expr_context.class)
 public class AugLoad extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(AugLoad.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.AugStore", base = AST.class)
+ at ExposedType(name = "_ast.AugStore", base = expr_context.class)
 public class AugStore extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(AugStore.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.BitAnd", base = AST.class)
+ at ExposedType(name = "_ast.BitAnd", base = operator.class)
 public class BitAnd extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(BitAnd.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.BitOr", base = AST.class)
+ at ExposedType(name = "_ast.BitOr", base = operator.class)
 public class BitOr extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(BitOr.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.BitXor", base = AST.class)
+ at ExposedType(name = "_ast.BitXor", base = operator.class)
 public class BitXor extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(BitXor.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Del", base = AST.class)
+ at ExposedType(name = "_ast.Del", base = expr_context.class)
 public class Del extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Del.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Div", base = AST.class)
+ at ExposedType(name = "_ast.Div", base = operator.class)
 public class Div extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Div.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Eq", base = AST.class)
+ at ExposedType(name = "_ast.Eq", base = cmpop.class)
 public class Eq extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Eq.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.FloorDiv", base = AST.class)
+ at ExposedType(name = "_ast.FloorDiv", base = operator.class)
 public class FloorDiv extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(FloorDiv.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Gt", base = AST.class)
+ at ExposedType(name = "_ast.Gt", base = cmpop.class)
 public class Gt extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Gt.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.GtE", base = AST.class)
+ at ExposedType(name = "_ast.GtE", base = cmpop.class)
 public class GtE extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(GtE.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.In", base = AST.class)
+ at ExposedType(name = "_ast.In", base = cmpop.class)
 public class In extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(In.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.unaryopType;
+import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Invert", base = AST.class)
+ at ExposedType(name = "_ast.Invert", base = unaryop.class)
 public class Invert extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Invert.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Is", base = AST.class)
+ at ExposedType(name = "_ast.Is", base = cmpop.class)
 public class Is extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Is.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.IsNot", base = AST.class)
+ at ExposedType(name = "_ast.IsNot", base = cmpop.class)
 public class IsNot extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(IsNot.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.LShift", base = AST.class)
+ at ExposedType(name = "_ast.LShift", base = operator.class)
 public class LShift extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(LShift.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Load", base = AST.class)
+ at ExposedType(name = "_ast.Load", base = expr_context.class)
 public class Load extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Load.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Lt", base = AST.class)
+ at ExposedType(name = "_ast.Lt", base = cmpop.class)
 public class Lt extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Lt.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.LtE", base = AST.class)
+ at ExposedType(name = "_ast.LtE", base = cmpop.class)
 public class LtE extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(LtE.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Mod", base = AST.class)
+ at ExposedType(name = "_ast.Mod", base = operator.class)
 public class Mod extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Mod.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Mult", base = AST.class)
+ at ExposedType(name = "_ast.Mult", base = operator.class)
 public class Mult extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Mult.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.unaryopType;
+import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Not", base = AST.class)
+ at ExposedType(name = "_ast.Not", base = unaryop.class)
 public class Not extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Not.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.NotEq", base = AST.class)
+ at ExposedType(name = "_ast.NotEq", base = cmpop.class)
 public class NotEq extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(NotEq.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.cmpopType;
+import org.python.antlr.base.cmpop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.NotIn", base = AST.class)
+ at ExposedType(name = "_ast.NotIn", base = cmpop.class)
 public class NotIn extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(NotIn.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.boolopType;
+import org.python.antlr.base.boolop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Or", base = AST.class)
+ at ExposedType(name = "_ast.Or", base = boolop.class)
 public class Or extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Or.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Param", base = AST.class)
+ at ExposedType(name = "_ast.Param", base = expr_context.class)
 public class Param extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Param.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Pow", base = AST.class)
+ at ExposedType(name = "_ast.Pow", base = operator.class)
 public class Pow extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Pow.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.RShift", base = AST.class)
+ at ExposedType(name = "_ast.RShift", base = operator.class)
 public class RShift extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(RShift.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.expr_contextType;
+import org.python.antlr.base.expr_context;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Store", base = AST.class)
+ at ExposedType(name = "_ast.Store", base = expr_context.class)
 public class Store extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Store.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.operatorType;
+import org.python.antlr.base.operator;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.Sub", base = AST.class)
+ at ExposedType(name = "_ast.Sub", base = operator.class)
 public class Sub extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(Sub.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.unaryopType;
+import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.UAdd", base = AST.class)
+ at ExposedType(name = "_ast.UAdd", base = unaryop.class)
 public class UAdd extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(UAdd.class);
 
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,7 +2,7 @@
 package org.python.antlr.op;
 
 import org.python.antlr.AST;
-import org.python.antlr.ast.unaryopType;
+import org.python.antlr.base.unaryop;
 import org.python.antlr.PythonTree;
 import org.python.core.Py;
 import org.python.core.PyObject;
@@ -14,7 +14,7 @@
 import org.python.expose.ExposedSet;
 import org.python.expose.ExposedType;
 
- at ExposedType(name = "_ast.USub", base = AST.class)
+ at ExposedType(name = "_ast.USub", base = unaryop.class)
 public class USub extends PythonTree {
     public static final PyType TYPE = PyType.fromClass(USub.class);
 

-- 
Repository URL: http://hg.python.org/jython

More information about the Jython-checkins mailing list