[pypy-svn] r20367 - in pypy/branch/somepbc-refactoring/pypy/rpython/l3interp: . test

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Nov 28 18:54:09 2005
New Revision: 20367

Modified:
   pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/convertgraph.py
   pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/test/test_convert.py
Log:
(arre, pedronis)

fix l3interp convergraph and its test.



Modified: pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/convertgraph.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/convertgraph.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/convertgraph.py	Mon Nov 28 18:54:09 2005
@@ -2,15 +2,14 @@
 from pypy.rpython.l3interp import l3interp
 from pypy.objspace.flow import model as flowmodel
 
-def convert(t):
-    cvter = LL2L3Converter(t)
+def convert(entrygraph):
+    cvter = LL2L3Converter(entrygraph)
     return cvter.globals
 
 class LL2L3Converter(object):
-    def __init__(self, t):
-        self.translator = t
+    def __init__(self, entrygraph):
         self.globals = model.Globals()
-        self.convert_graph(t.getflowgraph())
+        self.convert_graph(entrygraph)
 
     def convert_graph(self, graph):
         graph_cvter = LL2L3GraphConverter(graph, self)

Modified: pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/test/test_convert.py
==============================================================================
--- pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/test/test_convert.py	(original)
+++ pypy/branch/somepbc-refactoring/pypy/rpython/l3interp/test/test_convert.py	Mon Nov 28 18:54:09 2005
@@ -7,7 +7,7 @@
     t = Translator(f)
     t.annotate([int])
     t.specialize()
-    globals = convertgraph.convert(t)
+    globals = convertgraph.convert(t.graphs[0])
     interp = l3interp.LLInterpreter(globals)
     graph = globals.graphs[0]
     result = interp.eval_graph_int(graph, [0])