[pypy-svn] r77166 - pypy/trunk/pypy/jit/metainterp/optimizeopt

[benjamin at codespeak.net]

Author: benjamin
Date: Sat Sep 18 04:48:37 2010
New Revision: 77166

Modified:
   pypy/trunk/pypy/jit/metainterp/optimizeopt/__init__.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt/heap.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt/intbounds.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt/rewrite.py
   pypy/trunk/pypy/jit/metainterp/optimizeopt/virtualize.py
Log:
death to sibling imports

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/__init__.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/__init__.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/__init__.py	Sat Sep 18 04:48:37 2010
@@ -1,8 +1,8 @@
-from optimizer import Optimizer
-from rewrite import OptRewrite
-from intbounds import OptIntBounds
-from virtualize import OptVirtualize
-from heap import OptHeap
+from pypy.jit.metainterp.optimizeopt.optimizer import Optimizer
+from pypy.jit.metainterp.optimizeopt.rewrite import OptRewrite
+from pypy.jit.metainterp.optimizeopt.intbounds import OptIntBounds
+from pypy.jit.metainterp.optimizeopt.virtualize import OptVirtualize
+from pypy.jit.metainterp.optimizeopt.heap import OptHeap
 
 def optimize_loop_1(metainterp_sd, loop, virtuals=True):
     """Optimize loop.operations to make it match the input of loop.specnodes

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/heap.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/heap.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/heap.py	Sat Sep 18 04:48:37 2010
@@ -2,7 +2,7 @@
 from pypy.jit.metainterp.resoperation import rop, ResOperation
 from pypy.rlib.objectmodel import we_are_translated
 
-from optimizer import Optimization
+from pypy.jit.metainterp.optimizeopt.optimizer import Optimization
 
 class CachedArrayItems(object):
     def __init__(self):

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/intbounds.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/intbounds.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/intbounds.py	Sat Sep 18 04:48:37 2010
@@ -1,4 +1,4 @@
-from optimizer import Optimization, CONST_1, CONST_0
+from pypy.jit.metainterp.optimizeopt.optimizer import Optimization, CONST_1, CONST_0
 from pypy.jit.metainterp.optimizeutil import _findall
 from pypy.jit.metainterp.optimizeopt.intutils import IntBound, IntUnbounded, \
     IntLowerBound

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/optimizer.py	Sat Sep 18 04:48:37 2010
@@ -11,7 +11,7 @@
 from pypy.jit.metainterp.typesystem import llhelper, oohelper
 from pypy.rpython.lltypesystem import lltype
 from pypy.jit.metainterp.history import AbstractDescr, make_hashable_int
-from intutils import IntBound, IntUnbounded
+from pypy.jit.metainterp.optimizeopt.intutils import IntBound, IntUnbounded
 
 LEVEL_UNKNOWN    = '\x00'
 LEVEL_NONNULL    = '\x01'

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/rewrite.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/rewrite.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/rewrite.py	Sat Sep 18 04:48:37 2010
@@ -1,4 +1,4 @@
-from optimizer import *
+from pypy.jit.metainterp.optimizeopt.optimizer import *
 from pypy.jit.metainterp.resoperation import opboolinvers, opboolreflex
 from pypy.jit.metainterp.history import ConstInt
 from pypy.jit.metainterp.optimizeutil import _findall

Modified: pypy/trunk/pypy/jit/metainterp/optimizeopt/virtualize.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/optimizeopt/virtualize.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/optimizeopt/virtualize.py	Sat Sep 18 04:48:37 2010
@@ -6,7 +6,7 @@
 from pypy.jit.metainterp.resoperation import rop, ResOperation
 from pypy.jit.metainterp.optimizeutil import _findall
 from pypy.rlib.objectmodel import we_are_translated
-from optimizer import *
+from pypy.jit.metainterp.optimizeopt.optimizer import *
 
 
 class AbstractVirtualValue(OptValue):