[Jython-checkins] SF.net SVN: jython:[6823] trunk/jython/src/org/python

[<pj...@us...>]

Revision: 6823
          http://jython.svn.sourceforge.net/jython/?rev=6823&view=rev
Author:   pjenvey
Date:     2009-10-02 03:45:27 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
pass the cached type through constructors

Modified Paths:
--------------
    trunk/jython/src/org/python/antlr/PythonTree.java
    trunk/jython/src/org/python/core/PyDictionary.java
    trunk/jython/src/org/python/core/PyFunction.java
    trunk/jython/src/org/python/core/PyGenerator.java
    trunk/jython/src/org/python/core/PyMethod.java
    trunk/jython/src/org/python/core/PyStaticMethod.java
    trunk/jython/src/org/python/core/PyTraceback.java

Modified: trunk/jython/src/org/python/antlr/PythonTree.java
===================================================================
--- trunk/jython/src/org/python/antlr/PythonTree.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/antlr/PythonTree.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -25,6 +25,7 @@
     }
 
     public PythonTree(PyType subType) {
+        super(subType);
         node = new CommonTree();
     }
 

Modified: trunk/jython/src/org/python/core/PyDictionary.java
===================================================================
--- trunk/jython/src/org/python/core/PyDictionary.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyDictionary.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -33,6 +33,7 @@
      * Create an empty dictionary.
      */
     public PyDictionary() {
+        super(TYPE);
         table = Generic.concurrentMap();
     }
 
@@ -48,6 +49,7 @@
      * Create a new dictionary which is based on given map.
      */
     public PyDictionary(Map<PyObject, PyObject> t) {
+        super(TYPE);
         table = Generic.concurrentMap();
         table.putAll(t);
     }

Modified: trunk/jython/src/org/python/core/PyFunction.java
===================================================================
--- trunk/jython/src/org/python/core/PyFunction.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyFunction.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -57,6 +57,7 @@
 
     public PyFunction(PyObject globals, PyObject[] defaults, PyCode code, PyObject doc,
                       PyObject[] closure_cells) {
+        super(TYPE);
         func_globals = globals;
         __name__ = code.co_name;
         __doc__ = doc != null ? doc : Py.None;

Modified: trunk/jython/src/org/python/core/PyGenerator.java
===================================================================
--- trunk/jython/src/org/python/core/PyGenerator.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyGenerator.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -7,6 +7,8 @@
 @ExposedType(name = "generator", base = PyObject.class, isBaseType = false)
 public class PyGenerator extends PyIterator {
 
+    public static final PyType TYPE = PyType.fromClass(PyGenerator.class);
+
     @ExposedGet
     protected PyFrame gi_frame;
 
@@ -18,6 +20,7 @@
     private PyObject closure;
 
     public PyGenerator(PyFrame frame, PyObject closure) {
+        super(TYPE);
         gi_frame = frame;
         this.closure = closure;
 

Modified: trunk/jython/src/org/python/core/PyMethod.java
===================================================================
--- trunk/jython/src/org/python/core/PyMethod.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyMethod.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -28,6 +28,7 @@
     public PyObject im_self;
 
     public PyMethod(PyObject function, PyObject self, PyObject type) {
+        super(TYPE);
         if (self == Py.None){
             self = null;
         }

Modified: trunk/jython/src/org/python/core/PyStaticMethod.java
===================================================================
--- trunk/jython/src/org/python/core/PyStaticMethod.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyStaticMethod.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -15,6 +15,7 @@
     protected PyObject callable;
 
     public PyStaticMethod(PyObject callable) {
+        super(TYPE);
         this.callable = callable;
     }
 

Modified: trunk/jython/src/org/python/core/PyTraceback.java
===================================================================
--- trunk/jython/src/org/python/core/PyTraceback.java	2009-10-02 01:46:27 UTC (rev 6822)
+++ trunk/jython/src/org/python/core/PyTraceback.java	2009-10-02 03:45:27 UTC (rev 6823)
@@ -23,6 +23,7 @@
     public int tb_lineno;
 
     public PyTraceback(PyTraceback next, PyFrame frame) {
+        super(TYPE);
         tb_next = next;
         tb_frame = frame;
         tb_lineno = frame.getline();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.