Thread: [Jython-checkins] SF.net SVN: jython: [3166] trunk/jython (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 3166
          http://svn.sourceforge.net/jython/?rev=3166&view=rev
Author:   cgroves
Date:     2007-04-17 21:57:10 -0700 (Tue, 17 Apr 2007)

Log Message:
-----------
apply patch #1636030 from LeoUser for bug #1603686.  The comparison and shift operators in int now handle longs as arguments

Modified Paths:
--------------
    trunk/jython/NEWS
    trunk/jython/src/org/python/core/PyInteger.java

Modified: trunk/jython/NEWS
===================================================================

--- trunk/jython/NEWS	2007-04-18 04:33:00 UTC (rev 3165)
+++ trunk/jython/NEWS	2007-04-18 04:57:10 UTC (rev 3166)
@@ -24,6 +24,7 @@
     - [ 1619040 ] dict.fromkeys() should take iterable
     - [ 1658647 ] type(x) calls x.__class__.__init__
     - [ 1699556 ] SAXException descends from Java's Exception instead of Python's
+    - [ 1603686 ] Unmarshaling long-error
   Patches applied
     - [ 1681774 ] str.decode, unicode.encode and str(u'') fixes
     - [ 1682423 ] Convert PyModule to a new-style class

Modified: trunk/jython/src/org/python/core/PyInteger.java
===================================================================
--- trunk/jython/src/org/python/core/PyInteger.java	2007-04-18 04:33:00 UTC (rev 3165)
+++ trunk/jython/src/org/python/core/PyInteger.java	2007-04-18 04:57:10 UTC (rev 3166)
@@ -1124,7 +1124,10 @@
     final PyObject int___truediv__(PyObject right) {
         if (right instanceof PyInteger)
             return __float__().__truediv__(right);
-        return null;
+        else if(right instanceof PyLong)
+            return int___long__().__truediv__(right);
+	else
+            return null;
     }
 
     public PyObject __rtruediv__(PyObject left) {
@@ -1134,7 +1137,10 @@
     final PyObject int___rtruediv__(PyObject left) {
         if (left instanceof PyInteger)
             return left.__float__().__truediv__(this);
-        return null;
+        else if(left instanceof PyLong)
+            return left.__truediv__(int___long__());
+        else
+            return null;
     }
 
     private static int modulo(int x, int y, int xdivy) {
@@ -1293,11 +1299,13 @@
     }
 
     final PyObject int___lshift__(PyObject right) {
-        int rightv;
-        if (right instanceof PyInteger)
-             rightv = ((PyInteger)right).getValue();
-        else
-             return null;
+		int rightv;
+		if (right instanceof PyInteger)
+			rightv = ((PyInteger) right).getValue();
+		else if (right instanceof PyLong)
+			return int___long__().__lshift__(right);
+		else
+			return null;
 
         if (rightv > 31)
             return Py.newInteger(0);
@@ -1306,12 +1314,14 @@
         return Py.newInteger(getValue() << rightv);
     }
     
-    final PyObject int___rlshift__(PyObject left){
-        int leftv;
-        if (left instanceof PyInteger)
-        	leftv = ((PyInteger)left).getValue();
-        else
-             return null;
+    final PyObject int___rlshift__(PyObject left) {
+		int leftv;
+		if (left instanceof PyInteger)
+			leftv = ((PyInteger) left).getValue();
+		else if (left instanceof PyLong)
+			return left.__rlshift__(int___long__());
+		else
+			return null;
 
         if (getValue() > 31)
             return Py.newInteger(0);
@@ -1324,23 +1334,27 @@
         return int___rshift__(right);
     }
 
-    final PyObject int___rshift__(PyObject right) {
-        int rightv;
-        if (right instanceof PyInteger)
-             rightv = ((PyInteger)right).getValue();
-        else
-             return null;
+	final PyObject int___rshift__(PyObject right) {
+		int rightv;
+		if (right instanceof PyInteger)
+			rightv = ((PyInteger) right).getValue();
+		else if (right instanceof PyLong)
+			return int___long__().__rshift__(right);
+		else
+			return null;
 
-        if(rightv < 0)
-            throw Py.ValueError("negative shift count");
+		if (rightv < 0)
+			throw Py.ValueError("negative shift count");
 
-        return Py.newInteger(getValue() >> rightv);
-    }
+		return Py.newInteger(getValue() >> rightv);
+	}
 
     final PyObject int___rrshift__(PyObject left) {
         int leftv;
         if (left instanceof PyInteger)
         	leftv = ((PyInteger)left).getValue();
+        else if(left instanceof PyLong)
+        	return left.__rshift__(int___long__());
         else
              return null;
 
@@ -1357,7 +1371,9 @@
     final PyObject int___and__(PyObject right) {
         int rightv;
         if (right instanceof PyInteger)
-             rightv = ((PyInteger)right).getValue();
+             rightv = ((PyInteger) right).getValue();
+		else if (right instanceof PyLong)
+			return int___long__().__and__(right);
         else
              return null;
 
@@ -1372,20 +1388,24 @@
         return int___xor__(right);
     }
 
-    final PyObject int___xor__(PyObject right) {
-        int rightv;
-        if (right instanceof PyInteger)
-             rightv = ((PyInteger)right).getValue();
-        else
-             return null;
+	final PyObject int___xor__(PyObject right) {
+		int rightv;
+		if (right instanceof PyInteger)
+			rightv = ((PyInteger) right).getValue();
+		else if (right instanceof PyLong)
+			return int___long__().__xor__(right);
+		else
+			return null;
 
-        return Py.newInteger(getValue() ^ rightv);
+		return Py.newInteger(getValue() ^ rightv);
     }
     
 	final PyObject int___rxor__(PyObject left){
         int leftv;
         if (left instanceof PyInteger)
         	leftv = ((PyInteger)left).getValue();
+        else if(left instanceof PyLong)
+        	return left.__rxor__(int___long__());
         else
              return null;
 
@@ -1396,14 +1416,16 @@
         return int___or__(right);
     }
 
-    final PyObject int___or__(PyObject right) {
-        int rightv;
-        if (right instanceof PyInteger)
-             rightv = ((PyInteger)right).getValue();
-        else
-             return null;
+	final PyObject int___or__(PyObject right) {
+		int rightv;
+		if (right instanceof PyInteger)
+			rightv = ((PyInteger) right).getValue();
+		else if (right instanceof PyLong)
+			return int___long__().__or__(right);
+		else
+			return null;
 
-        return Py.newInteger(getValue() | rightv);
+		return Py.newInteger(getValue() | rightv);
     }
     
     final PyObject int___ror__(PyObject left){


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




Thread: [Jython-checkins] SF.net SVN: jython: [3166] trunk/jython (Page 2)

jython-checkins