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

[cfbolz at codespeak.net]

Author: cfbolz
Date: Wed Nov 21 14:49:08 2007
New Revision: 48900

Modified:
   pypy/dist/pypy/annotation/bookkeeper.py
   pypy/dist/pypy/annotation/builtin.py
   pypy/dist/pypy/annotation/signature.py
Log:
(xoraxax, cfbolz, pedronis): kill some code that is dead now that the
extfunctable is gone


Modified: pypy/dist/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/dist/pypy/annotation/bookkeeper.py	(original)
+++ pypy/dist/pypy/annotation/bookkeeper.py	Wed Nov 21 14:49:08 2007
@@ -405,8 +405,6 @@
         elif extregistry.is_registered(x, self.policy):
             entry = extregistry.lookup(x, self.policy)
             result = entry.compute_annotation_bk(self)
-        elif tp in EXTERNAL_TYPE_ANALYZERS:
-            result = SomeExternalObject(tp)
         elif isinstance(x, lltype._ptr):
             result = SomePtr(lltype.typeOf(x))
         elif isinstance(x, llmemory.fakeaddress):
@@ -771,7 +769,6 @@
 
 def delayed_imports():
     # import ordering hack
-    global BUILTIN_ANALYZERS, EXTERNAL_TYPE_ANALYZERS
+    global BUILTIN_ANALYZERS
     from pypy.annotation.builtin import BUILTIN_ANALYZERS
-    from pypy.annotation.builtin import EXTERNAL_TYPE_ANALYZERS
 

Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py	(original)
+++ pypy/dist/pypy/annotation/builtin.py	Wed Nov 21 14:49:08 2007
@@ -361,7 +361,6 @@
 # collect all functions
 import __builtin__, exceptions
 BUILTIN_ANALYZERS = {}
-EXTERNAL_TYPE_ANALYZERS = {}
 for name, value in globals().items():
     if name.startswith('builtin_'):
         original = getattr(__builtin__, name[8:])

Modified: pypy/dist/pypy/annotation/signature.py
==============================================================================
--- pypy/dist/pypy/annotation/signature.py	(original)
+++ pypy/dist/pypy/annotation/signature.py	Wed Nov 21 14:49:08 2007
@@ -66,7 +66,6 @@
 
 def annotationoftype(t, bookkeeper=False):
     from pypy.annotation.builtin import BUILTIN_ANALYZERS
-    from pypy.annotation.builtin import EXTERNAL_TYPE_ANALYZERS
     from pypy.rpython import extregistry
 
     """The most precise SomeValue instance that contains all
@@ -89,8 +88,6 @@
     # can't do tuple
     elif t is types.NoneType:
         return s_None
-    elif t in EXTERNAL_TYPE_ANALYZERS:
-        return SomeExternalObject(t)
     elif bookkeeper and extregistry.is_registered_type(t, bookkeeper.policy):
         entry = extregistry.lookup_type(t, bookkeeper.policy)
         return entry.compute_annotation_bk(bookkeeper)