[pypy-svn] r66050 - pypy/branch/pyjitpl5/pypy/annotation

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:35:40 2009
New Revision: 66050

Added:
   pypy/branch/pyjitpl5/pypy/annotation/binaryop.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/annotation/binaryop.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/annotation/binaryop.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65525 | pedronis | 2009-06-01 08:22:12 +0200 (Mon, 01 Jun 2009) | 5 lines
    
    reverting 65522, it broke a couple tests in applevel and lib-python tests
    
    not completely clear why, in general our error code is not that well tested by our own tests
    
    
    ------------------------------------------------------------------------
    r65522 | benjamin | 2009-06-01 02:00:54 +0200 (Mon, 01 Jun 2009) | 1 line
    
    normalize raise statements
    ------------------------------------------------------------------------
    r64279 | cfbolz | 2009-04-17 16:11:06 +0200 (Fri, 17 Apr 2009) | 2 lines
    
    (cfbolz, pedronis around): merge the kill-bltregistry branch.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/annotation/binaryop.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/annotation/binaryop.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/annotation/binaryop.py	(original)
+++ pypy/branch/pyjitpl5/pypy/annotation/binaryop.py.merge.tmp	Tue Jun 30 16:35:40 2009
@@ -19,7 +19,7 @@
 from pypy.annotation.model import read_can_only_throw
 from pypy.annotation.model import add_knowntypedata, merge_knowntypedata
 from pypy.annotation.model import SomeGenericCallable
-from pypy.annotation.model import SomeExternalInstance, SomeUnicodeString
+from pypy.annotation.model import SomeUnicodeString
 from pypy.annotation.bookkeeper import getbookkeeper
 from pypy.objspace.flow.model import Variable, Constant
 from pypy.rlib import rarithmetic
@@ -821,20 +821,6 @@
             return SomeExternalObject(ext1.knowntype)
         return SomeObject()
 
-class __extend__(pairtype(SomeExternalInstance, SomeExternalInstance)):
-    def union((ext1, ext2)):
-        def commonsuperclass(cls1, cls2):
-            cls = cls2
-            while not issubclass(cls1, cls):
-                cls = cls.__bases__[0]
-            return cls
-        
-        from pypy.rpython.ootypesystem.bltregistry import BasicExternal
-        cls = commonsuperclass(ext1.knowntype, ext2.knowntype)
-        if cls is BasicExternal:
-            return SomeObject()
-        return SomeExternalInstance(cls)
-
 # ____________________________________________________________
 # annotation of low-level types
 from pypy.annotation.model import SomePtr, SomeOOInstance, SomeOOClass