Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r58357:139a66be1b94
Date: 2012-10-22 14:33 +0200
http://bitbucket.org/pypy/pypy/changeset/139a66be1b94/
Log: fix a lot of imports
diff --git a/pypy/jit/backend/llgraph/runner.py
b/pypy/jit/backend/llgraph/runner.py
--- a/pypy/jit/backend/llgraph/runner.py
+++ b/pypy/jit/backend/llgraph/runner.py
@@ -1,8 +1,9 @@
import weakref
from pypy.jit.backend import model
from pypy.jit.backend.llgraph import support
-from pypy.jit.metainterp.history import Const, getkind, AbstractDescr
-from pypy.jit.metainterp.history import INT, REF, FLOAT, VOID
+from pypy.jit.metainterp.history import AbstractDescr
+from pypy.jit.metainterp.resoperation import Const, getkind
+from pypy.jit.metainterp.resoperation import INT, REF, FLOAT, VOID
from pypy.jit.metainterp.resoperation import rop
from pypy.jit.codewriter import longlong, heaptracker
from pypy.jit.codewriter.effectinfo import EffectInfo
diff --git a/pypy/jit/backend/llgraph/support.py
b/pypy/jit/backend/llgraph/support.py
--- a/pypy/jit/backend/llgraph/support.py
+++ b/pypy/jit/backend/llgraph/support.py
@@ -2,7 +2,7 @@
from pypy.jit.codewriter import longlong
from pypy.jit.codewriter import heaptracker
-from pypy.jit.metainterp.history import getkind, INT, REF
+from pypy.jit.metainterp.resoperation import getkind
from pypy.rlib.rarithmetic import r_longlong, r_ulonglong, r_uint
from pypy.rpython.lltypesystem import lltype, rffi, llmemory
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -12,7 +12,6 @@
ConstPtr
from pypy.jit.metainterp.history import TreeLoop, JitCellToken, TargetToken
from pypy.jit.metainterp.history import AbstractFailDescr
-from pypy.jit.metainterp.resoperation import BoxPtr, BoxFloat, Box, BoxInt
from pypy.jit.metainterp import resoperation
from pypy.jit.metainterp.optimize import InvalidLoop
from pypy.jit.metainterp.resume import NUMBERING, PENDINGFIELDSP
diff --git a/pypy/jit/metainterp/resoperation.py
b/pypy/jit/metainterp/resoperation.py
--- a/pypy/jit/metainterp/resoperation.py
+++ b/pypy/jit/metainterp/resoperation.py
@@ -1394,7 +1394,6 @@
is_guard = name.startswith('GUARD')
if is_guard or name == 'FINISH':
- assert withdescr
baseclass = GuardResOp
elif withdescr:
baseclass = ResOpWithDescr
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -1,5 +1,4 @@
from pypy.jit.metainterp.resoperation import Const, ConstInt, getkind
-from pypy.jit.metainterp.resoperation import BoxInt, BoxPtr, BoxFloat
from pypy.jit.metainterp.resoperation import INT, REF, FLOAT
from pypy.jit.metainterp.history import AbstractDescr
from pypy.jit.metainterp.resoperation import rop
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
