[pypy-svn] r13573 - pypy/dist/pypy/annotation

[pedronis at codespeak.net]

Author: pedronis
Date: Sat Jun 18 01:50:40 2005
New Revision: 13573

Modified:
   pypy/dist/pypy/annotation/binaryop.py
Log:
union of SomeBuiltin should consider the methodname too



Modified: pypy/dist/pypy/annotation/binaryop.py
==============================================================================
--- pypy/dist/pypy/annotation/binaryop.py	(original)
+++ pypy/dist/pypy/annotation/binaryop.py	Sat Jun 18 01:50:40 2005
@@ -473,11 +473,11 @@
 class __extend__(pairtype(SomeBuiltin, SomeBuiltin)):
 
     def union((bltn1, bltn2)):
-        if bltn1.analyser != bltn2.analyser:
+        if bltn1.analyser != bltn2.analyser or bltn1.methodname != bltn2.methodname:
             raise UnionError("merging incompatible builtins == BAD!")
         else:
             s_self = unionof(bltn1.s_self, bltn2.s_self)
-            return SomeBuiltin(bltn1.analyser, s_self)
+            return SomeBuiltin(bltn1.analyser, s_self, methodname=bltn1.methodname)
 
 class __extend__(pairtype(SomePBC, SomePBC)):
     def union((pbc1, pbc2)):