[pypy-svn] r13820 - in pypy/dist/pypy: annotation rpython translator

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun 24 17:23:24 2005
New Revision: 13820

Modified:
   pypy/dist/pypy/annotation/policy.py
   pypy/dist/pypy/rpython/annlowlevel.py
   pypy/dist/pypy/translator/annrpython.py
Log:
Moved BasicAnnotatorPolicy to annotation.policy.


Modified: pypy/dist/pypy/annotation/policy.py
==============================================================================
--- pypy/dist/pypy/annotation/policy.py	(original)
+++ pypy/dist/pypy/annotation/policy.py	Fri Jun 24 17:23:24 2005
@@ -1,6 +1,15 @@
 # base annotation policy for overrides and specialization
 from pypy.annotation.specialize import memo, ctr_location, default_specialize as default
-from pypy.translator.annrpython import BasicAnnotatorPolicy
+
+
+class BasicAnnotatorPolicy:
+    
+    def specialize(pol, bookkeeper, spaceop, func, args, mono):
+        return None, None
+
+    def compute_at_fixpoint(pol, annotator):
+        annotator.bookkeeper.compute_at_fixpoint()
+
 
 class AnnotatorPolicy(BasicAnnotatorPolicy):
     """

Modified: pypy/dist/pypy/rpython/annlowlevel.py
==============================================================================
--- pypy/dist/pypy/rpython/annlowlevel.py	(original)
+++ pypy/dist/pypy/rpython/annlowlevel.py	Fri Jun 24 17:23:24 2005
@@ -4,7 +4,7 @@
 
 from pypy.annotation import model as annmodel
 from pypy.annotation.specialize import decide_callable
-from pypy.translator.annrpython import BasicAnnotatorPolicy
+from pypy.annotation.policy import BasicAnnotatorPolicy
 
 def not_const(s_obj): # xxx move it somewhere else
     if s_obj.is_constant():

Modified: pypy/dist/pypy/translator/annrpython.py
==============================================================================
--- pypy/dist/pypy/translator/annrpython.py	(original)
+++ pypy/dist/pypy/translator/annrpython.py	Fri Jun 24 17:23:24 2005
@@ -15,14 +15,6 @@
 class AnnotatorError(Exception):
     pass
 
-class BasicAnnotatorPolicy:
-    
-    def specialize(pol, bookkeeper, spaceop, func, args, mono):
-        return None, None
-
-    def compute_at_fixpoint(pol, annotator):
-        annotator.bookkeeper.compute_at_fixpoint()
-
 
 class RPythonAnnotator:
     """Block annotator for RPython.
@@ -55,7 +47,8 @@
         self.frozen = False
         # user-supplied annotation logic for functions we don't want to flow into
         if policy is None:
-            self.policy = BasicAnnotatorPolicy()
+            from pypy.annotation.policy import AnnotatorPolicy
+            self.policy = AnnotatorPolicy()
         else:
             self.policy = policy