[pypy-svn] r35381 - pypy/branch/jit-real-world/pypy/annotation

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Dec  6 12:49:48 2006
New Revision: 35381

Modified:
   pypy/branch/jit-real-world/pypy/annotation/binaryop.py
Log:
svn merge -r35361:HEAD http://codespeak.net/svn/pypy/dist/pypy/annotation annotation



Modified: pypy/branch/jit-real-world/pypy/annotation/binaryop.py
==============================================================================
--- pypy/branch/jit-real-world/pypy/annotation/binaryop.py	(original)
+++ pypy/branch/jit-real-world/pypy/annotation/binaryop.py	Wed Dec  6 12:49:48 2006
@@ -636,15 +636,16 @@
         d.update(pbc2.descriptions)
         return SomePBC(d, can_be_None = pbc1.can_be_None or pbc2.can_be_None)
 
-    def is_((obj1, obj2)):
+    def is_((pbc1, pbc2)):
         thistype = pairtype(SomePBC, SomePBC)
-        s = super(thistype, pair(obj1, obj2)).is_()
+        s = super(thistype, pair(pbc1, pbc2)).is_()
         if not s.is_constant():
-            for desc in obj1.descriptions:
-                if desc in obj2.descriptions:
-                    break
-            else:
-                s.const = False    # no common desc in the two sets
+            if not pbc1.can_be_None or not pbc2.can_be_None:
+                for desc in pbc1.descriptions:
+                    if desc in pbc2.descriptions:
+                        break
+                else:
+                    s.const = False    # no common desc in the two sets
         return s
 
 class __extend__(pairtype(SomeImpossibleValue, SomeObject)):