[pypy-svn] rev 2014 - pypy/trunk/src/pypy/translator

[sanxiyn at codespeak.net]

Author: sanxiyn
Date: Tue Oct 21 07:35:49 2003
New Revision: 2014

Modified:
   pypy/trunk/src/pypy/translator/annotation.py
   pypy/trunk/src/pypy/translator/gencl.py
   pypy/trunk/src/pypy/translator/peepfgt.py
Log:
simplify_hooks cleanup.
Moved simplify_hooks from class to instance.


Modified: pypy/trunk/src/pypy/translator/annotation.py
==============================================================================
--- pypy/trunk/src/pypy/translator/annotation.py	(original)
+++ pypy/trunk/src/pypy/translator/annotation.py	Tue Oct 21 07:35:49 2003
@@ -10,6 +10,7 @@
 
     def __init__(self, flowgraph):
         self.flowgraph = flowgraph
+        self.simplify_hooks = []
 
     def build_types(self, input_arg_types):
         input_ann = AnnotationSet()
@@ -63,8 +64,6 @@
                 newops.append(op)
             block.operations = tuple(newops)
 
-    simplify_hooks = []
-
     def simplify(self):
         self.simplify_calls()
         for hook in self.simplify_hooks:

Modified: pypy/trunk/src/pypy/translator/gencl.py
==============================================================================
--- pypy/trunk/src/pypy/translator/gencl.py	(original)
+++ pypy/trunk/src/pypy/translator/gencl.py	Tue Oct 21 07:35:49 2003
@@ -2,8 +2,7 @@
 from pypy.translator.flowmodel import *
 from pypy.translator.annotation import Annotator
 
-from pypy.translator.peepfgt import register
-register()
+from pypy.translator.peepfgt import register as fgt_register
 
 # For 2.2 -- sanxiyn
 if not isinstance(bool, type):
@@ -66,6 +65,7 @@
     def annotate(self, input_arg_types):
         ann = Annotator(self.fun)
         ann.build_types(input_arg_types)
+        fgt_register(ann)
         ann.simplify()
         self.ann = ann
     def str(self, obj):

Modified: pypy/trunk/src/pypy/translator/peepfgt.py
==============================================================================
--- pypy/trunk/src/pypy/translator/peepfgt.py	(original)
+++ pypy/trunk/src/pypy/translator/peepfgt.py	Tue Oct 21 07:35:49 2003
@@ -24,5 +24,5 @@
                                     (new_op,) +
                                     operations[i+2:])
 
-def register():
-    Annotator.simplify_hooks.append(transform_allocate)
+def register(ann):
+    ann.simplify_hooks.append(transform_allocate)