[pypy-svn] r13780 - pypy/dist/pypy/rpython

[tismer at codespeak.net]

Author: tismer
Date: Fri Jun 24 13:27:19 2005
New Revision: 13780

Modified:
   pypy/dist/pypy/rpython/llinterp.py
   pypy/dist/pypy/rpython/normalizecalls.py
Log:
even more less aster-risk

Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Fri Jun 24 13:27:19 2005
@@ -3,7 +3,8 @@
 from pypy.objspace.flow.model import Constant, Variable, last_exception
 from pypy.rpython.rarithmetic import intmask, r_uint
 import py
-from pypy.rpython.lltype import _ptr, Void, typeOf, malloc, cast_pointer, Array
+from pypy.rpython.lltype import _ptr, Ptr, Void, typeOf, malloc, cast_pointer
+from pypy.rpython.lltype import Array
 
 log = py.log.Producer('llinterp')
 

Modified: pypy/dist/pypy/rpython/normalizecalls.py
==============================================================================
--- pypy/dist/pypy/rpython/normalizecalls.py	(original)
+++ pypy/dist/pypy/rpython/normalizecalls.py	Fri Jun 24 13:27:19 2005
@@ -1,7 +1,7 @@
 import types
 from pypy.objspace.flow.model import Variable, Constant, Block, Link
 from pypy.objspace.flow.model import SpaceOperation, checkgraph
-from pypy.annotation.model import *
+from pypy.annotation import model as annmodel
 from pypy.tool.sourcetools import has_varargs
 from pypy.rpython.rmodel import TyperError
 
@@ -113,11 +113,11 @@
                 for graph, bindings in graph_bindings.items():
                     j = graph_argorders[graph][i]
                     args_s.append(bindings[j])
-                s_value = unionof(*args_s)
+                s_value = annmodel.unionof(*args_s)
                 generalizedargs.append(s_value)
             result_s = [annotator.binding(graph.getreturnvar())
                         for graph in graph_bindings]
-            generalizedresult = unionof(*result_s)
+            generalizedresult = annmodel.unionof(*result_s)
 
             for func in functions:
                 graph = annotator.translator.getflowgraph(func)