[pypy-svn] r18934 - in pypy/dist/pypy: annotation module/thread/rpython rpython rpython/l3interp rpython/lltypesystem rpython/memory rpython/memory/test rpython/module rpython/ootypesystem/test rpython/test translator translator/asm translator/backendopt translator/backendopt/test translator/c translator/c/test translator/js translator/js/test translator/llvm translator/llvm/backendopt translator/llvm/test
mwh at codespeak.net
mwh at codespeak.net
Tue Oct 25 16:05:37 CEST 2005
Author: mwh
Date: Tue Oct 25 16:05:11 2005
New Revision: 18934
Removed:
pypy/dist/pypy/rpython/lltype.py
Modified:
pypy/dist/pypy/annotation/builtin.py
pypy/dist/pypy/annotation/model.py
pypy/dist/pypy/module/thread/rpython/ll_thread.py
pypy/dist/pypy/rpython/annlowlevel.py
pypy/dist/pypy/rpython/extfunctable.py
pypy/dist/pypy/rpython/l3interp/model.py
pypy/dist/pypy/rpython/llinterp.py
pypy/dist/pypy/rpython/lltypesystem/exceptiondata.py
pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
pypy/dist/pypy/rpython/lltypesystem/rclass.py
pypy/dist/pypy/rpython/lltypesystem/rpbc.py
pypy/dist/pypy/rpython/memory/convertlltype.py
pypy/dist/pypy/rpython/memory/gc.py
pypy/dist/pypy/rpython/memory/gclltype.py
pypy/dist/pypy/rpython/memory/gcwrapper.py
pypy/dist/pypy/rpython/memory/lladdress.py
pypy/dist/pypy/rpython/memory/lltypelayout.py
pypy/dist/pypy/rpython/memory/lltypesimulation.py
pypy/dist/pypy/rpython/memory/support.py
pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py
pypy/dist/pypy/rpython/module/ll_math.py
pypy/dist/pypy/rpython/module/ll_os.py
pypy/dist/pypy/rpython/module/support.py
pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py
pypy/dist/pypy/rpython/raddress.py
pypy/dist/pypy/rpython/rbool.py
pypy/dist/pypy/rpython/rbuiltin.py
pypy/dist/pypy/rpython/rdict.py
pypy/dist/pypy/rpython/rexternalobj.py
pypy/dist/pypy/rpython/rfloat.py
pypy/dist/pypy/rpython/rint.py
pypy/dist/pypy/rpython/rlist.py
pypy/dist/pypy/rpython/rmodel.py
pypy/dist/pypy/rpython/robject.py
pypy/dist/pypy/rpython/rpbc.py
pypy/dist/pypy/rpython/rptr.py
pypy/dist/pypy/rpython/rrange.py
pypy/dist/pypy/rpython/rslice.py
pypy/dist/pypy/rpython/rstr.py
pypy/dist/pypy/rpython/rtuple.py
pypy/dist/pypy/rpython/rtyper.py
pypy/dist/pypy/rpython/test/test_exception.py
pypy/dist/pypy/rpython/test/test_llann.py
pypy/dist/pypy/rpython/test/test_llinterp.py
pypy/dist/pypy/rpython/test/test_lltype.py
pypy/dist/pypy/rpython/test/test_normalizecalls.py
pypy/dist/pypy/rpython/test/test_rbool.py
pypy/dist/pypy/rpython/test/test_rbuiltin.py
pypy/dist/pypy/rpython/test/test_rclass.py
pypy/dist/pypy/rpython/test/test_rdict.py
pypy/dist/pypy/rpython/test/test_rexternalobj.py
pypy/dist/pypy/rpython/test/test_rlist.py
pypy/dist/pypy/rpython/test/test_robject.py
pypy/dist/pypy/rpython/test/test_rpbc.py
pypy/dist/pypy/rpython/test/test_rptr.py
pypy/dist/pypy/rpython/test/test_rspecialcase.py
pypy/dist/pypy/rpython/test/test_rstr.py
pypy/dist/pypy/rpython/test/test_rtuple.py
pypy/dist/pypy/rpython/test/test_rtyper.py
pypy/dist/pypy/translator/asm/genasm.py
pypy/dist/pypy/translator/backendopt/inline.py
pypy/dist/pypy/translator/backendopt/malloc.py
pypy/dist/pypy/translator/backendopt/propagate.py
pypy/dist/pypy/translator/backendopt/removenoops.py
pypy/dist/pypy/translator/backendopt/tailrecursion.py
pypy/dist/pypy/translator/backendopt/test/test_removenoops.py
pypy/dist/pypy/translator/c/database.py
pypy/dist/pypy/translator/c/external.py
pypy/dist/pypy/translator/c/extfunc.py
pypy/dist/pypy/translator/c/funcgen.py
pypy/dist/pypy/translator/c/gc.py
pypy/dist/pypy/translator/c/genc.py
pypy/dist/pypy/translator/c/node.py
pypy/dist/pypy/translator/c/primitive.py
pypy/dist/pypy/translator/c/pyobj.py
pypy/dist/pypy/translator/c/stackless.py
pypy/dist/pypy/translator/c/support.py
pypy/dist/pypy/translator/c/symboltable.py
pypy/dist/pypy/translator/c/test/test_database.py
pypy/dist/pypy/translator/c/test/test_genc.py
pypy/dist/pypy/translator/c/test/test_lltyped.py
pypy/dist/pypy/translator/c/wrapper.py
pypy/dist/pypy/translator/js/arraynode.py
pypy/dist/pypy/translator/js/database.py
pypy/dist/pypy/translator/js/funcnode.py
pypy/dist/pypy/translator/js/js.py
pypy/dist/pypy/translator/js/node.py
pypy/dist/pypy/translator/js/opaquenode.py
pypy/dist/pypy/translator/js/opwriter.py
pypy/dist/pypy/translator/js/structnode.py
pypy/dist/pypy/translator/js/test/test_lltype.py
pypy/dist/pypy/translator/llvm/arraynode.py
pypy/dist/pypy/translator/llvm/backendopt/exception.py
pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py
pypy/dist/pypy/translator/llvm/database.py
pypy/dist/pypy/translator/llvm/externs2ll.py
pypy/dist/pypy/translator/llvm/funcnode.py
pypy/dist/pypy/translator/llvm/genllvm.py
pypy/dist/pypy/translator/llvm/node.py
pypy/dist/pypy/translator/llvm/opaquenode.py
pypy/dist/pypy/translator/llvm/opwriter.py
pypy/dist/pypy/translator/llvm/pyxwrapper.py
pypy/dist/pypy/translator/llvm/structnode.py
pypy/dist/pypy/translator/llvm/test/test_lltype.py
pypy/dist/pypy/translator/simplify.py
Log:
remove rpython/lltype.py (easy!) and fix all the references to it to be
to rpython/lltypesystem/lltype.py (tedious!).
haven't run ALL the tests yet, will do that on snake.
Modified: pypy/dist/pypy/annotation/builtin.py
==============================================================================
--- pypy/dist/pypy/annotation/builtin.py (original)
+++ pypy/dist/pypy/annotation/builtin.py Tue Oct 25 16:05:11 2005
@@ -326,7 +326,7 @@
# annotation of low-level types
from pypy.annotation.model import SomePtr
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
def malloc(T, n=None):
assert n is None or n.knowntype == int
Modified: pypy/dist/pypy/annotation/model.py
==============================================================================
--- pypy/dist/pypy/annotation/model.py (original)
+++ pypy/dist/pypy/annotation/model.py Tue Oct 25 16:05:11 2005
@@ -456,7 +456,7 @@
def __init__(self, method):
self.method = method
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.ootypesystem import ootype
annotation_to_ll_map = [
Modified: pypy/dist/pypy/module/thread/rpython/ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/rpython/ll_thread.py (original)
+++ pypy/dist/pypy/module/thread/rpython/ll_thread.py Tue Oct 25 16:05:11 2005
@@ -4,7 +4,7 @@
"""
import thread
-from pypy.rpython.lltype import malloc
+from pypy.rpython.lltypesystem.lltype import malloc
from pypy.rpython.module.support import init_opaque_object, from_opaque_object
from pypy.module.thread.rpython.exttable import locktypeinfo
Modified: pypy/dist/pypy/rpython/annlowlevel.py
==============================================================================
--- pypy/dist/pypy/rpython/annlowlevel.py (original)
+++ pypy/dist/pypy/rpython/annlowlevel.py Tue Oct 25 16:05:11 2005
@@ -6,7 +6,7 @@
from pypy.annotation import model as annmodel
from pypy.annotation.specialize import decide_callable
from pypy.annotation.policy import AnnotatorPolicy
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython import extfunctable
def not_const(s_obj): # xxx move it somewhere else
Modified: pypy/dist/pypy/rpython/extfunctable.py
==============================================================================
--- pypy/dist/pypy/rpython/extfunctable.py (original)
+++ pypy/dist/pypy/rpython/extfunctable.py Tue Oct 25 16:05:11 2005
@@ -49,7 +49,7 @@
def get_lltype(self):
if self._TYPE is None:
- from pypy.rpython import lltype
+ from pypy.rpython.lltypesystem import lltype
OPAQUE = lltype.OpaqueType(self.tag)
OPAQUE._exttypeinfo = self
if self.needs_container:
Modified: pypy/dist/pypy/rpython/l3interp/model.py
==============================================================================
--- pypy/dist/pypy/rpython/l3interp/model.py (original)
+++ pypy/dist/pypy/rpython/l3interp/model.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.rpython.memory import lladdress
from pypy.objspace.flow import model as flowmodel
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
very_low_level_ops = [
#operations with adresses:
Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py (original)
+++ pypy/dist/pypy/rpython/llinterp.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
from pypy.tool.sourcetools import compile2
from pypy.objspace.flow.model import Constant, Variable, last_exception
from pypy.rpython.rarithmetic import intmask, r_uint, ovfcheck
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.rmodel import getfunctionptr
from pypy.rpython.memory import lladdress
from pypy.rpython.objectmodel import free_non_gc_object
Modified: pypy/dist/pypy/rpython/lltypesystem/exceptiondata.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/exceptiondata.py (original)
+++ pypy/dist/pypy/rpython/lltypesystem/exceptiondata.py Tue Oct 25 16:05:11 2005
@@ -1,8 +1,9 @@
from pypy.annotation import model as annmodel
from pypy.rpython.lltypesystem import rclass
from pypy.rpython.annlowlevel import annotate_lowlevel_helper
-from pypy.rpython.lltype import Array, malloc, Ptr, PyObject, pyobjectptr
-from pypy.rpython.lltype import FuncType, functionptr, Signed
+from pypy.rpython.lltypesystem.lltype import \
+ Array, malloc, Ptr, PyObject, pyobjectptr, \
+ FuncType, functionptr, Signed
from pypy.rpython.extfunctable import standardexceptions
from pypy.annotation.classdef import FORCE_ATTRIBUTES_INTO_CLASSES
Modified: pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py (original)
+++ pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py Tue Oct 25 16:05:11 2005
@@ -1,11 +1,11 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
+from pypy.rpython.lltypesystem import rclass
from pypy.rpython import objectmodel
from pypy.rpython.rmodel import TyperError, Constant
from pypy.rpython.robject import pyobj_repr
from pypy.rpython.rbool import bool_repr
-from pypy.rpython.lltypesystem import rclass
def rtype_builtin_isinstance(hop):
if hop.s_result.is_constant():
Modified: pypy/dist/pypy/rpython/lltypesystem/rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rclass.py (original)
+++ pypy/dist/pypy/rpython/lltypesystem/rclass.py Tue Oct 25 16:05:11 2005
@@ -11,12 +11,13 @@
getclassrepr, getinstancerepr,\
get_type_repr, rtype_new_instance,\
instance_annotation_for_cls
-from pypy.rpython.lltype import ForwardReference, GcForwardReference
-from pypy.rpython.lltype import Ptr, Struct, GcStruct, malloc
-from pypy.rpython.lltype import cast_pointer, castable, nullptr
-from pypy.rpython.lltype import RuntimeTypeInfo, getRuntimeTypeInfo, typeOf
-from pypy.rpython.lltype import Array, Char, Void, attachRuntimeTypeInfo
-from pypy.rpython.lltype import FuncType, Bool, Signed
+from pypy.rpython.lltypesystem.lltype import \
+ ForwardReference, GcForwardReference, \
+ Ptr, Struct, GcStruct, malloc, \
+ cast_pointer, castable, nullptr, \
+ RuntimeTypeInfo, getRuntimeTypeInfo, typeOf, \
+ Array, Char, Void, attachRuntimeTypeInfo, \
+ FuncType, Bool, Signed
#
# There is one "vtable" per user class, with the following structure:
Modified: pypy/dist/pypy/rpython/lltypesystem/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rpbc.py (original)
+++ pypy/dist/pypy/rpython/lltypesystem/rpbc.py Tue Oct 25 16:05:11 2005
@@ -4,8 +4,9 @@
from pypy.annotation import model as annmodel
from pypy.annotation.classdef import isclassdef
from pypy.objspace.flow.model import Constant
-from pypy.rpython.lltype import typeOf, Void, ForwardReference, Struct, Bool
-from pypy.rpython.lltype import Ptr, malloc, nullptr
+from pypy.rpython.lltypesystem.lltype import \
+ typeOf, Void, ForwardReference, Struct, Bool, \
+ Ptr, malloc, nullptr
from pypy.rpython.rmodel import Repr, TyperError, inputconst, warning
from pypy.rpython import robject
from pypy.rpython import rtuple
Modified: pypy/dist/pypy/rpython/memory/convertlltype.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/convertlltype.py (original)
+++ pypy/dist/pypy/rpython/memory/convertlltype.py Tue Oct 25 16:05:11 2005
@@ -4,7 +4,7 @@
from pypy.rpython.memory.lltypesimulation import init_object_on_address
from pypy.objspace.flow.model import traverse, Link, Constant, Block
from pypy.objspace.flow.model import Constant
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.rmodel import IntegerRepr
Modified: pypy/dist/pypy/rpython/memory/gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gc.py (original)
+++ pypy/dist/pypy/rpython/memory/gc.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
from pypy.rpython.memory.lladdress import NULL, address, Address
from pypy.rpython.memory.support import AddressLinkedList
from pypy.rpython.memory import lltypesimulation
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.objectmodel import free_non_gc_object
import sys
Modified: pypy/dist/pypy/rpython/memory/gclltype.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gclltype.py (original)
+++ pypy/dist/pypy/rpython/memory/gclltype.py Tue Oct 25 16:05:11 2005
@@ -1,9 +1,10 @@
-from pypy.rpython.lltype import LowLevelType, ContainerType, Struct, GcStruct
-from pypy.rpython.lltype import Array, GcArray, FuncType, OpaqueType
-from pypy.rpython.lltype import RuntimeTypeInfo, PyObjectType, PyObject
-from pypy.rpython.lltype import GC_CONTAINER
-from pypy.rpython.lltype import Signed, Unsigned, Float, Char, Bool, Void
-from pypy.rpython.lltype import UniChar, Ptr, typeOf, InvalidCast
+from pypy.rpython.lltypesystem.lltype import \
+ LowLevelType, ContainerType, Struct, GcStruct, \
+ Array, GcArray, FuncType, OpaqueType, \
+ RuntimeTypeInfo, PyObjectType, PyObject, \
+ GC_CONTAINER, \
+ Signed, Unsigned, Float, Char, Bool, Void, \
+ UniChar, Ptr, typeOf, InvalidCast
from pypy.rpython.memory.convertlltype import FlowGraphConstantConverter
from pypy.rpython.memory.lltypesimulation import cast_pointer, free
from pypy.rpython.memory.lltypesimulation import simulatorptr as _ptr
Modified: pypy/dist/pypy/rpython/memory/gcwrapper.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gcwrapper.py (original)
+++ pypy/dist/pypy/rpython/memory/gcwrapper.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.annrpython import RPythonAnnotator
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory.support import AddressLinkedList, INT_SIZE
from pypy.rpython.memory.lladdress import raw_malloc, raw_free, NULL
from pypy.rpython.memory import lltypelayout
Modified: pypy/dist/pypy/rpython/memory/lladdress.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lladdress.py (original)
+++ pypy/dist/pypy/rpython/memory/lladdress.py Tue Oct 25 16:05:11 2005
@@ -109,7 +109,7 @@
return simulator.get_py_object(address.intaddress)
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
Address = lltype.Primitive("Address", NULL)
address._TYPE = Address
Modified: pypy/dist/pypy/rpython/memory/lltypelayout.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lltypelayout.py (original)
+++ pypy/dist/pypy/rpython/memory/lltypelayout.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory import lladdress
import struct
Modified: pypy/dist/pypy/rpython/memory/lltypesimulation.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lltypesimulation.py (original)
+++ pypy/dist/pypy/rpython/memory/lltypesimulation.py Tue Oct 25 16:05:11 2005
@@ -4,7 +4,7 @@
from pypy.rpython.memory.lltypelayout import get_variable_size, sizeof
from pypy.rpython.memory.lltypelayout import primitive_to_fmt
from pypy.rpython.memory import lladdress
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
log = py.log.Producer("lltypesim")
Modified: pypy/dist/pypy/rpython/memory/support.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/support.py (original)
+++ pypy/dist/pypy/rpython/memory/support.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.rpython.memory.lladdress import raw_malloc, raw_free, NULL
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory.lltypelayout import sizeof
import struct
Modified: pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py (original)
+++ pypy/dist/pypy/rpython/memory/test/test_llinterpsim.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import py
-from pypy.rpython.lltype import typeOf, Ptr, PyObject
+from pypy.rpython.lltypesystem.lltype import typeOf, Ptr, PyObject
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.llinterp import LLInterpreter, LLException,log
from pypy.translator.translator import Translator
Modified: pypy/dist/pypy/rpython/module/ll_math.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_math.py (original)
+++ pypy/dist/pypy/rpython/module/ll_math.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
import math
import py
Modified: pypy/dist/pypy/rpython/module/ll_os.py
==============================================================================
--- pypy/dist/pypy/rpython/module/ll_os.py (original)
+++ pypy/dist/pypy/rpython/module/ll_os.py Tue Oct 25 16:05:11 2005
@@ -15,7 +15,8 @@
import os, errno
from pypy.rpython.rstr import STR
-from pypy.rpython.lltype import GcStruct, Signed, Array, Char, Ptr, malloc
+from pypy.rpython.lltypesystem.lltype import \
+ GcStruct, Signed, Array, Char, Ptr, malloc
from pypy.rpython.module.support import to_rstr, from_rstr, ll_strcpy
from pypy.rpython.module.support import to_opaque_object, from_opaque_object
from pypy.rpython import ros
Modified: pypy/dist/pypy/rpython/module/support.py
==============================================================================
--- pypy/dist/pypy/rpython/module/support.py (original)
+++ pypy/dist/pypy/rpython/module/support.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,8 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython import extfunctable
from pypy.rpython.rstr import STR
-from pypy.rpython.lltype import GcStruct, Signed, Array, Char, Ptr, malloc
+from pypy.rpython.lltypesystem.lltype import \
+ GcStruct, Signed, Array, Char, Ptr, malloc
# utility conversion functions
Modified: pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py (original)
+++ pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.ootypesystem import ootype
from pypy.rpython.test.test_llinterp import get_interpreter
import py
Modified: pypy/dist/pypy/rpython/raddress.py
==============================================================================
--- pypy/dist/pypy/rpython/raddress.py (original)
+++ pypy/dist/pypy/rpython/raddress.py Tue Oct 25 16:05:11 2005
@@ -3,7 +3,7 @@
from pypy.annotation import model as annmodel
from pypy.rpython.memory.lladdress import address, NULL, Address
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
class __extend__(annmodel.SomeAddress):
def rtyper_makerepr(self, rtyper):
Modified: pypy/dist/pypy/rpython/rbool.py
==============================================================================
--- pypy/dist/pypy/rpython/rbool.py (original)
+++ pypy/dist/pypy/rpython/rbool.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Signed, Unsigned, Bool, Float, pyobjectptr
+from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float, pyobjectptr
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, BoolRepr
from pypy.rpython.robject import PyObjRepr, pyobj_repr
from pypy.rpython.rmodel import log
Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py (original)
+++ pypy/dist/pypy/rpython/rbuiltin.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython import rarithmetic, objectmodel, rstack
from pypy.rpython.rtyper import TyperError
from pypy.rpython.rrange import rtype_builtin_range, rtype_builtin_xrange
Modified: pypy/dist/pypy/rpython/rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/rdict.py (original)
+++ pypy/dist/pypy/rpython/rdict.py Tue Oct 25 16:05:11 2005
@@ -1,12 +1,13 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
from pypy.objspace.flow.model import Constant
-from pypy.rpython import rmodel, lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.rarithmetic import r_uint
from pypy.rpython.objectmodel import hlinvoke
from pypy.rpython import rlist
from pypy.rpython import robject
from pypy.rpython import objectmodel
+from pypy.rpython import rmodel
# ____________________________________________________________
#
Modified: pypy/dist/pypy/rpython/rexternalobj.py
==============================================================================
--- pypy/dist/pypy/rpython/rexternalobj.py (original)
+++ pypy/dist/pypy/rpython/rexternalobj.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.rmodel import Repr
from pypy.rpython.extfunctable import typetable
from pypy.rpython import rbuiltin
Modified: pypy/dist/pypy/rpython/rfloat.py
==============================================================================
--- pypy/dist/pypy/rpython/rfloat.py (original)
+++ pypy/dist/pypy/rpython/rfloat.py Tue Oct 25 16:05:11 2005
@@ -1,12 +1,12 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Signed, Unsigned, Bool, Float, Void, Ptr
+from pypy.rpython.lltypesystem.lltype import \
+ Signed, Unsigned, Bool, Float, Void, Ptr, \
+ PyObject, Array, Char, functionptr, FuncType, malloc
from pypy.rpython.rmodel import Repr, TyperError, FloatRepr
from pypy.rpython.rmodel import IntegerRepr, BoolRepr
from pypy.rpython.robject import PyObjRepr, pyobj_repr
-from pypy.rpython.lltype import PyObject, Array, Char
from pypy.rpython.rstr import STR, string_repr
-from pypy.rpython.lltype import functionptr, FuncType, malloc
from pypy.rpython import rstr
from pypy.rpython.rmodel import log
Modified: pypy/dist/pypy/rpython/rint.py
==============================================================================
--- pypy/dist/pypy/rpython/rint.py (original)
+++ pypy/dist/pypy/rpython/rint.py Tue Oct 25 16:05:11 2005
@@ -2,8 +2,8 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
from pypy.objspace.flow.objspace import op_appendices
-from pypy.rpython.lltype import Signed, Unsigned, Bool, Float, Void, Char, \
- UniChar, GcArray, malloc, Array, pyobjectptr
+from pypy.rpython.lltypesystem.lltype import Signed, Unsigned, Bool, Float, \
+ Void, Char, UniChar, GcArray, malloc, Array, pyobjectptr
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, CharRepr, \
inputconst
from pypy.rpython.robject import PyObjRepr, pyobj_repr
Modified: pypy/dist/pypy/rpython/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/rlist.py (original)
+++ pypy/dist/pypy/rpython/rlist.py Tue Oct 25 16:05:11 2005
@@ -6,9 +6,10 @@
from pypy.rpython.rslice import SliceRepr
from pypy.rpython.rslice import startstop_slice_repr, startonly_slice_repr
from pypy.rpython.rslice import minusone_slice_repr
-from pypy.rpython.lltype import GcForwardReference, Ptr, GcArray, GcStruct
-from pypy.rpython.lltype import Void, Signed, malloc, typeOf, Primitive
-from pypy.rpython.lltype import Bool, nullptr, typeMethod
+from pypy.rpython.lltypesystem. lltype import \
+ GcForwardReference, Ptr, GcArray, GcStruct, \
+ Void, Signed, malloc, typeOf, Primitive, \
+ Bool, nullptr, typeMethod
from pypy.rpython import rstr
from pypy.rpython import robject
Modified: pypy/dist/pypy/rpython/rmodel.py
==============================================================================
--- pypy/dist/pypy/rpython/rmodel.py (original)
+++ pypy/dist/pypy/rpython/rmodel.py Tue Oct 25 16:05:11 2005
@@ -1,9 +1,10 @@
from pypy.annotation.pairtype import pair, pairtype, extendabletype
from pypy.annotation import model as annmodel
from pypy.objspace.flow.model import Constant
-from pypy.rpython.lltype import Void, Bool, Float, Signed, Char, UniChar
-from pypy.rpython.lltype import typeOf, LowLevelType, Ptr, PyObject
-from pypy.rpython.lltype import FuncType, functionptr, cast_ptr_to_int
+from pypy.rpython.lltypesystem.lltype import \
+ Void, Bool, Float, Signed, Char, UniChar, \
+ typeOf, LowLevelType, Ptr, PyObject, \
+ FuncType, functionptr, cast_ptr_to_int
from pypy.rpython.ootypesystem import ootype
from pypy.rpython.error import TyperError, MissingRTypeOperation
Modified: pypy/dist/pypy/rpython/robject.py
==============================================================================
--- pypy/dist/pypy/rpython/robject.py (original)
+++ pypy/dist/pypy/rpython/robject.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,7 @@
from pypy.annotation.pairtype import pair, pairtype
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import PyObject, Ptr, Void, Bool, pyobjectptr, nullptr
+from pypy.rpython.lltypesystem.lltype import \
+ PyObject, Ptr, Void, Bool, pyobjectptr, nullptr
from pypy.rpython.rmodel import Repr, TyperError, VoidRepr, inputconst
from pypy.rpython import rclass
from pypy.tool.sourcetools import func_with_new_name
Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py (original)
+++ pypy/dist/pypy/rpython/rpbc.py Tue Oct 25 16:05:11 2005
@@ -4,8 +4,9 @@
from pypy.annotation import model as annmodel
from pypy.annotation.classdef import isclassdef
from pypy.objspace.flow.model import Constant
-from pypy.rpython.lltype import typeOf, Void, ForwardReference, Struct, Bool
-from pypy.rpython.lltype import Ptr, malloc, nullptr
+from pypy.rpython.lltypesystem.lltype import \
+ typeOf, Void, ForwardReference, Struct, Bool, \
+ Ptr, malloc, nullptr
from pypy.rpython.rmodel import Repr, TyperError, inputconst, warning
from pypy.rpython import rclass
from pypy.rpython import robject
Modified: pypy/dist/pypy/rpython/rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/rptr.py (original)
+++ pypy/dist/pypy/rpython/rptr.py Tue Oct 25 16:05:11 2005
@@ -1,8 +1,8 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
from pypy.objspace.flow import model as flowmodel
-from pypy.rpython.lltype import Ptr, _ptr
-from pypy.rpython.lltype import ContainerType, Void, Signed, Bool, FuncType, typeOf
+from pypy.rpython.lltypesystem.lltype import \
+ Ptr, _ptr, ContainerType, Void, Signed, Bool, FuncType, typeOf
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
Modified: pypy/dist/pypy/rpython/rrange.py
==============================================================================
--- pypy/dist/pypy/rpython/rrange.py (original)
+++ pypy/dist/pypy/rpython/rrange.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
from pypy.annotation.pairtype import pairtype
from pypy.annotation import model as annmodel
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, IteratorRepr
-from pypy.rpython.lltype import Ptr, GcStruct, Signed, malloc, Void
+from pypy.rpython.lltypesystem.lltype import Ptr, GcStruct, Signed, malloc, Void
from pypy.objspace.flow.model import Constant
from pypy.rpython.rlist import ll_newlist, dum_nocheck, dum_checkidx
Modified: pypy/dist/pypy/rpython/rslice.py
==============================================================================
--- pypy/dist/pypy/rpython/rslice.py (original)
+++ pypy/dist/pypy/rpython/rslice.py Tue Oct 25 16:05:11 2005
@@ -3,7 +3,8 @@
from pypy.objspace.flow.model import Constant
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr
import sys
-from pypy.rpython.lltype import GcStruct, Signed, Ptr, Void,malloc
+from pypy.rpython.lltypesystem.lltype import \
+ GcStruct, Signed, Ptr, Void, malloc
# ____________________________________________________________
#
Modified: pypy/dist/pypy/rpython/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/rstr.py (original)
+++ pypy/dist/pypy/rpython/rstr.py Tue Oct 25 16:05:11 2005
@@ -10,8 +10,9 @@
from pypy.rpython.rslice import SliceRepr
from pypy.rpython.rslice import startstop_slice_repr, startonly_slice_repr
from pypy.rpython.rslice import minusone_slice_repr
-from pypy.rpython.lltype import GcStruct, Signed, Array, Char, Ptr, malloc
-from pypy.rpython.lltype import Bool, Void, GcArray, nullptr, typeOf, pyobjectptr
+from pypy.rpython.lltypesystem.lltype import \
+ GcStruct, Signed, Array, Char, Ptr, malloc, \
+ Bool, Void, GcArray, nullptr, typeOf, pyobjectptr
# ____________________________________________________________
Modified: pypy/dist/pypy/rpython/rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/rtuple.py (original)
+++ pypy/dist/pypy/rpython/rtuple.py Tue Oct 25 16:05:11 2005
@@ -4,8 +4,8 @@
from pypy.rpython.rmodel import Repr, TyperError, IntegerRepr, inputconst
from pypy.rpython.rmodel import IteratorRepr
from pypy.rpython.robject import PyObjRepr, pyobj_repr
-from pypy.rpython.lltype import Ptr, GcStruct, Void, Signed, malloc
-from pypy.rpython.lltype import typeOf, nullptr
+from pypy.rpython.lltypesystem.lltype import \
+ Ptr, GcStruct, Void, Signed, malloc, typeOf, nullptr
# ____________________________________________________________
#
Modified: pypy/dist/pypy/rpython/rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/rtyper.py (original)
+++ pypy/dist/pypy/rpython/rtyper.py Tue Oct 25 16:05:11 2005
@@ -18,10 +18,11 @@
from pypy.annotation import model as annmodel
from pypy.objspace.flow.model import Variable, Constant, Block, Link
from pypy.objspace.flow.model import SpaceOperation, last_exception
-from pypy.rpython.lltype import Signed, Unsigned, Float, Char, Bool, Void
-from pypy.rpython.lltype import LowLevelType, Ptr, ContainerType
-from pypy.rpython.lltype import FuncType, functionptr, typeOf, RuntimeTypeInfo
-from pypy.rpython.lltype import attachRuntimeTypeInfo, Primitive
+from pypy.rpython.lltypesystem.lltype import \
+ Signed, Unsigned, Float, Char, Bool, Void, \
+ LowLevelType, Ptr, ContainerType, \
+ FuncType, functionptr, typeOf, RuntimeTypeInfo, \
+ attachRuntimeTypeInfo, Primitive
from pypy.rpython.ootypesystem import ootype
from pypy.tool.sourcetools import func_with_new_name, valid_identifier
from pypy.translator.unsimplify import insert_empty_block
Modified: pypy/dist/pypy/rpython/test/test_exception.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_exception.py (original)
+++ pypy/dist/pypy/rpython/test/test_exception.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.test.test_llinterp import interpret
Modified: pypy/dist/pypy/rpython/test/test_llann.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_llann.py (original)
+++ pypy/dist/pypy/rpython/test/test_llann.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.annotation import model as annmodel
from pypy.rpython.annlowlevel import annotate_lowlevel_helper
from pypy.objspace.flow import FlowObjSpace
Modified: pypy/dist/pypy/rpython/test/test_llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_llinterp.py (original)
+++ pypy/dist/pypy/rpython/test/test_llinterp.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import py
-from pypy.rpython.lltype import typeOf, pyobjectptr, Ptr, PyObject
+from pypy.rpython.lltypesystem.lltype import typeOf, pyobjectptr, Ptr, PyObject
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.llinterp import LLInterpreter, LLException,log
from pypy.translator.translator import Translator
Modified: pypy/dist/pypy/rpython/test/test_lltype.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_lltype.py (original)
+++ pypy/dist/pypy/rpython/test/test_lltype.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
def isweak(p, T):
return p._weak and typeOf(p).TO == T
Modified: pypy/dist/pypy/rpython/test/test_normalizecalls.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_normalizecalls.py (original)
+++ pypy/dist/pypy/rpython/test/test_normalizecalls.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
from pypy.translator.translator import Translator
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.test.test_llinterp import interpret
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
def rtype(fn, argtypes=[]):
Modified: pypy/dist/pypy/rpython/test/test_rbool.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rbool.py (original)
+++ pypy/dist/pypy/rpython/test/test_rbool.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import pyobjectptr
+from pypy.rpython.lltypesystem.lltype import pyobjectptr
from pypy.rpython.rtyper import RPythonTyper
from pypy.annotation import model as annmodel
from pypy.rpython.test import snippet
Modified: pypy/dist/pypy/rpython/test/test_rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rbuiltin.py (original)
+++ pypy/dist/pypy/rpython/test/test_rbuiltin.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython.test import test_llinterp
from pypy.rpython.objectmodel import instantiate, we_are_translated
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.objspace.flow import model as flowmodel
from pypy.tool import udir
Modified: pypy/dist/pypy/rpython/test/test_rclass.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rclass.py (original)
+++ pypy/dist/pypy/rpython/test/test_rclass.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython.rarithmetic import intmask
Modified: pypy/dist/pypy/rpython/test/test_rdict.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rdict.py (original)
+++ pypy/dist/pypy/rpython/test/test_rdict.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython import rstr, rint, rdict
Modified: pypy/dist/pypy/rpython/test/test_rexternalobj.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rexternalobj.py (original)
+++ pypy/dist/pypy/rpython/test/test_rexternalobj.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret, gengraph
from pypy.annotation.policy import AnnotatorPolicy
Modified: pypy/dist/pypy/rpython/test/test_rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rlist.py (original)
+++ pypy/dist/pypy/rpython/test/test_rlist.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import sys
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.rlist import *
from pypy.rpython.rslice import ll_newslice
Modified: pypy/dist/pypy/rpython/test/test_robject.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_robject.py (original)
+++ pypy/dist/pypy/rpython/test/test_robject.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret
Modified: pypy/dist/pypy/rpython/test/test_rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rpbc.py (original)
+++ pypy/dist/pypy/rpython/test/test_rpbc.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.test.test_llinterp import interpret
Modified: pypy/dist/pypy/rpython/test/test_rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rptr.py (original)
+++ pypy/dist/pypy/rpython/test/test_rptr.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.translator.annrpython import RPythonAnnotator
from pypy.rpython.annlowlevel import annotate_lowlevel_helper, LowLevelAnnotatorPolicy
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
from pypy.annotation import model as annmodel
Modified: pypy/dist/pypy/rpython/test/test_rspecialcase.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rspecialcase.py (original)
+++ pypy/dist/pypy/rpython/test/test_rspecialcase.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret, gengraph
from pypy.translator.ann_override import PyPyAnnotatorPolicy
Modified: pypy/dist/pypy/rpython/test/test_rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rstr.py (original)
+++ pypy/dist/pypy/rpython/test/test_rstr.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import random
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rstr import parse_fmt_string, ll_find, ll_rfind, STR
from pypy.rpython.rtyper import RPythonTyper, TyperError
from pypy.rpython.test.test_llinterp import interpret, interpret_raises
Modified: pypy/dist/pypy/rpython/test/test_rtuple.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rtuple.py (original)
+++ pypy/dist/pypy/rpython/test/test_rtuple.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.translator import Translator
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.rtuple import *
from pypy.rpython.rint import signed_repr
Modified: pypy/dist/pypy/rpython/test/test_rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rtyper.py (original)
+++ pypy/dist/pypy/rpython/test/test_rtyper.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
from pypy.annotation import model as annmodel
from pypy.translator.translator import Translator
from pypy.translator import annrpython
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython import rmodel
Modified: pypy/dist/pypy/translator/asm/genasm.py
==============================================================================
--- pypy/dist/pypy/translator/asm/genasm.py (original)
+++ pypy/dist/pypy/translator/asm/genasm.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
import sys, os
from pypy.objspace.flow.model import traverse, Block, Variable, Constant
#from pypy.translator.asm import infregmachine
-from pypy.rpython.lltype import Signed
+from pypy.rpython.lltypesystem.lltype import Signed
from pypy.translator.asm.simulator import Machine, TranslateProgram
from pypy.translator.asm.model import *
Modified: pypy/dist/pypy/translator/backendopt/inline.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/inline.py (original)
+++ pypy/dist/pypy/translator/backendopt/inline.py Tue Oct 25 16:05:11 2005
@@ -6,7 +6,7 @@
from pypy.objspace.flow.model import SpaceOperation, last_exception
from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Bool, typeOf, Void
+from pypy.rpython.lltypesystem.lltype import Bool, typeOf, Void
from pypy.rpython import rmodel
from pypy.tool.algo import sparsemat
from pypy.translator.backendopt.support import log
Modified: pypy/dist/pypy/translator/backendopt/malloc.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/malloc.py (original)
+++ pypy/dist/pypy/translator/backendopt/malloc.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
from pypy.objspace.flow.model import Variable, Constant, Block, Link
from pypy.objspace.flow.model import SpaceOperation, traverse, checkgraph
from pypy.tool.algo.unionfind import UnionFind
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.simplify import remove_identical_vars
from pypy.translator.backendopt.support import log
Modified: pypy/dist/pypy/translator/backendopt/propagate.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/propagate.py (original)
+++ pypy/dist/pypy/translator/backendopt/propagate.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
from pypy.objspace.flow.model import Block, Variable, Constant, last_exception
from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph
from pypy.objspace.flow.model import SpaceOperation
-from pypy.rpython.lltype import Void, Bool
+from pypy.rpython.lltypesystem.lltype import Void, Bool
from pypy.rpython.llinterp import LLInterpreter, LLFrame
from pypy.translator import simplify
from pypy.translator.backendopt.tailrecursion import get_graph
Modified: pypy/dist/pypy/translator/backendopt/removenoops.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/removenoops.py (original)
+++ pypy/dist/pypy/translator/backendopt/removenoops.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
from pypy.objspace.flow.model import Block, Variable, Constant
from pypy.objspace.flow.model import traverse
-from pypy.rpython.lltype import Void
+from pypy.rpython.lltypesystem.lltype import Void
def remove_same_as(graph):
"""Remove all 'same_as' operations.
Modified: pypy/dist/pypy/translator/backendopt/tailrecursion.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/tailrecursion.py (original)
+++ pypy/dist/pypy/translator/backendopt/tailrecursion.py Tue Oct 25 16:05:11 2005
@@ -5,7 +5,7 @@
from pypy.objspace.flow.model import SpaceOperation, last_exception
from pypy.objspace.flow.model import traverse, mkentrymap, checkgraph, flatten
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Bool, typeOf, FuncType, _ptr
+from pypy.rpython.lltypesystem.lltype import Bool, typeOf, FuncType, _ptr
# this transformation is very academical -- I had too much time
Modified: pypy/dist/pypy/translator/backendopt/test/test_removenoops.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_removenoops.py (original)
+++ pypy/dist/pypy/translator/backendopt/test/test_removenoops.py Tue Oct 25 16:05:11 2005
@@ -3,7 +3,7 @@
from pypy.translator.translator import Translator
from pypy.translator.test.snippet import simple_method
from pypy.objspace.flow.model import checkgraph, flatten, Block
-from pypy.rpython.lltype import Void
+from pypy.rpython.lltypesystem.lltype import Void
from pypy.rpython.llinterp import LLInterpreter
import py
Modified: pypy/dist/pypy/translator/c/database.py
==============================================================================
--- pypy/dist/pypy/translator/c/database.py (original)
+++ pypy/dist/pypy/translator/c/database.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,8 @@
import sys
-from pypy.rpython.lltype import Primitive, Ptr, typeOf, RuntimeTypeInfo
-from pypy.rpython.lltype import Struct, Array, FuncType, PyObject, Void
-from pypy.rpython.lltype import ContainerType, pyobjectptr, OpaqueType, GcStruct
+from pypy.rpython.lltypesystem.lltype import \
+ Primitive, Ptr, typeOf, RuntimeTypeInfo, \
+ Struct, Array, FuncType, PyObject, Void, \
+ ContainerType, pyobjectptr, OpaqueType, GcStruct
from pypy.objspace.flow.model import Constant
from pypy.translator.c.primitive import PrimitiveName, PrimitiveType
from pypy.translator.c.primitive import PrimitiveErrorValue
Modified: pypy/dist/pypy/translator/c/external.py
==============================================================================
--- pypy/dist/pypy/translator/c/external.py (original)
+++ pypy/dist/pypy/translator/c/external.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from __future__ import generators
-from pypy.rpython.lltype import typeOf, Void
+from pypy.rpython.lltypesystem.lltype import typeOf, Void
from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
from pypy.translator.c.support import cdecl, ErrorValue, somelettersfrom
Modified: pypy/dist/pypy/translator/c/extfunc.py
==============================================================================
--- pypy/dist/pypy/translator/c/extfunc.py (original)
+++ pypy/dist/pypy/translator/c/extfunc.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import types
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.c.support import cdecl
from pypy.rpython.rmodel import getfunctionptr
from pypy.rpython.rstr import STR
Modified: pypy/dist/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/dist/pypy/translator/c/funcgen.py (original)
+++ pypy/dist/pypy/translator/c/funcgen.py Tue Oct 25 16:05:11 2005
@@ -4,8 +4,8 @@
from pypy.translator.c.support import llvalue_from_constant, gen_assignments
from pypy.objspace.flow.model import Variable, Constant, Block
from pypy.objspace.flow.model import traverse, last_exception
-from pypy.rpython.lltype import Ptr, PyObject, Void, Bool
-from pypy.rpython.lltype import pyobjectptr, Struct, Array
+from pypy.rpython.lltypesystem.lltype import \
+ Ptr, PyObject, Void, Bool, pyobjectptr, Struct, Array
PyObjPtr = Ptr(PyObject)
Modified: pypy/dist/pypy/translator/c/gc.py
==============================================================================
--- pypy/dist/pypy/translator/c/gc.py (original)
+++ pypy/dist/pypy/translator/c/gc.py Tue Oct 25 16:05:11 2005
@@ -1,9 +1,9 @@
import sys
from pypy.translator.c.support import cdecl
from pypy.translator.c.node import ContainerNode
-from pypy.rpython.lltype import typeOf, Ptr, PyObject, ContainerType
-from pypy.rpython.lltype import Array, GcArray, Struct, GcStruct
-from pypy.rpython.lltype import RuntimeTypeInfo, getRuntimeTypeInfo
+from pypy.rpython.lltypesystem.lltype import \
+ typeOf, Ptr, PyObject, ContainerType, Array, GcArray, Struct, GcStruct, \
+ RuntimeTypeInfo, getRuntimeTypeInfo
PyObjPtr = Ptr(PyObject)
Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py (original)
+++ pypy/dist/pypy/translator/c/genc.py Tue Oct 25 16:05:11 2005
@@ -8,7 +8,7 @@
from pypy.translator.tool.cbuild import build_executable
from pypy.translator.tool.cbuild import import_module_from_directory
from pypy.rpython.rmodel import getfunctionptr
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.tool.udir import udir
from pypy.translator.locality.calltree import CallTree
Modified: pypy/dist/pypy/translator/c/node.py
==============================================================================
--- pypy/dist/pypy/translator/c/node.py (original)
+++ pypy/dist/pypy/translator/c/node.py Tue Oct 25 16:05:11 2005
@@ -1,8 +1,9 @@
from __future__ import generators
-from pypy.rpython.lltype import Struct, Array, FuncType, PyObjectType, typeOf
-from pypy.rpython.lltype import GcStruct, GcArray, GC_CONTAINER, ContainerType
-from pypy.rpython.lltype import parentlink, Ptr, PyObject, Void, OpaqueType, Float
-from pypy.rpython.lltype import RuntimeTypeInfo, getRuntimeTypeInfo, Char
+from pypy.rpython.lltypesystem.lltype import \
+ Struct, Array, FuncType, PyObjectType, typeOf, \
+ GcStruct, GcArray, GC_CONTAINER, ContainerType, \
+ parentlink, Ptr, PyObject, Void, OpaqueType, Float, \
+ RuntimeTypeInfo, getRuntimeTypeInfo, Char
from pypy.translator.c.funcgen import FunctionCodeGenerator
from pypy.translator.c.external import CExternalFunctionCodeGenerator
from pypy.translator.c.support import USESLOTS # set to False if necessary while refactoring
Modified: pypy/dist/pypy/translator/c/primitive.py
==============================================================================
--- pypy/dist/pypy/translator/c/primitive.py (original)
+++ pypy/dist/pypy/translator/c/primitive.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import sys
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.memory.lladdress import Address, NULL
# ____________________________________________________________
Modified: pypy/dist/pypy/translator/c/pyobj.py
==============================================================================
--- pypy/dist/pypy/translator/c/pyobj.py (original)
+++ pypy/dist/pypy/translator/c/pyobj.py Tue Oct 25 16:05:11 2005
@@ -7,7 +7,7 @@
from pypy.translator.c.support import log
from pypy.rpython.rarithmetic import r_int, r_uint
-from pypy.rpython.lltype import pyobjectptr, LowLevelType
+from pypy.rpython.lltypesystem.lltype import pyobjectptr, LowLevelType
# XXX maybe this can be done more elegantly:
# needed to convince should_translate_attr
Modified: pypy/dist/pypy/translator/c/stackless.py
==============================================================================
--- pypy/dist/pypy/translator/c/stackless.py (original)
+++ pypy/dist/pypy/translator/c/stackless.py Tue Oct 25 16:05:11 2005
@@ -6,7 +6,7 @@
import py
from pypy.objspace.flow.model import Variable
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory.lladdress import Address
from pypy.translator.c.support import cdecl
from pypy.translator.c.funcgen import FunctionCodeGenerator
Modified: pypy/dist/pypy/translator/c/support.py
==============================================================================
--- pypy/dist/pypy/translator/c/support.py (original)
+++ pypy/dist/pypy/translator/c/support.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.gensupp import NameManager
#
Modified: pypy/dist/pypy/translator/c/symboltable.py
==============================================================================
--- pypy/dist/pypy/translator/c/symboltable.py (original)
+++ pypy/dist/pypy/translator/c/symboltable.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
class SymbolTable:
Modified: pypy/dist/pypy/translator/c/test/test_database.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_database.py (original)
+++ pypy/dist/pypy/translator/c/test/test_database.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import autopath, sys
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.translator.translator import Translator
from pypy.translator.c.database import LowLevelDatabase
from pypy.objspace.flow.model import Constant, Variable, SpaceOperation
Modified: pypy/dist/pypy/translator/c/test/test_genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_genc.py (original)
+++ pypy/dist/pypy/translator/c/test/test_genc.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import autopath, sys, os, py
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.annotation import model as annmodel
from pypy.translator.translator import Translator
from pypy.translator.c.database import LowLevelDatabase
Modified: pypy/dist/pypy/translator/c/test/test_lltyped.py
==============================================================================
--- pypy/dist/pypy/translator/c/test/test_lltyped.py (original)
+++ pypy/dist/pypy/translator/c/test/test_lltyped.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython.lltype import *
+from pypy.rpython.lltypesystem.lltype import *
from pypy.translator.tool.cbuild import skip_missing_compiler
from pypy.translator.translator import Translator
from pypy.objspace.flow import FlowObjSpace
Modified: pypy/dist/pypy/translator/c/wrapper.py
==============================================================================
--- pypy/dist/pypy/translator/c/wrapper.py (original)
+++ pypy/dist/pypy/translator/c/wrapper.py Tue Oct 25 16:05:11 2005
@@ -1,8 +1,8 @@
from pypy.objspace.flow.model import Variable, Constant, SpaceOperation
from pypy.objspace.flow.model import Block, Link, FunctionGraph, checkgraph
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Ptr, PyObject, typeOf, Signed, Void
-from pypy.rpython.lltype import FuncType, functionptr
+from pypy.rpython.lltypesystem.lltype import \
+ Ptr, PyObject, typeOf, Signed, Void, FuncType, functionptr
from pypy.rpython.rtyper import LowLevelOpList
from pypy.rpython.rmodel import inputconst, getfunctionptr, PyObjPtr
from pypy.rpython.robject import pyobj_repr
Modified: pypy/dist/pypy/translator/js/arraynode.py
==============================================================================
--- pypy/dist/pypy/translator/js/arraynode.py (original)
+++ pypy/dist/pypy/translator/js/arraynode.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import py
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.js.node import LLVMNode, ConstantLLVMNode
from pypy.translator.js.log import log
log = log.structnode
Modified: pypy/dist/pypy/translator/js/database.py
==============================================================================
--- pypy/dist/pypy/translator/js/database.py (original)
+++ pypy/dist/pypy/translator/js/database.py Tue Oct 25 16:05:11 2005
@@ -7,7 +7,7 @@
from pypy.translator.js.arraynode import ArrayNode, StrArrayNode, VoidArrayNode
from pypy.translator.js.opaquenode import OpaqueNode
from pypy.translator.js.node import ConstantLLVMNode
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.objspace.flow.model import Constant, Variable
from pypy.translator.js.log import log
Modified: pypy/dist/pypy/translator/js/funcnode.py
==============================================================================
--- pypy/dist/pypy/translator/js/funcnode.py (original)
+++ pypy/dist/pypy/translator/js/funcnode.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
import sys
from pypy.objspace.flow.model import Block, Constant, Variable, Link
from pypy.objspace.flow.model import flatten, mkentrymap, traverse, last_exception
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.js.node import LLVMNode, ConstantLLVMNode
from pypy.translator.js.opwriter import OpWriter
from pypy.translator.js.log import log
Modified: pypy/dist/pypy/translator/js/js.py
==============================================================================
--- pypy/dist/pypy/translator/js/js.py (original)
+++ pypy/dist/pypy/translator/js/js.py Tue Oct 25 16:05:11 2005
@@ -15,7 +15,7 @@
import py
from pypy.rpython.rmodel import inputconst, getfunctionptr
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.tool.udir import udir
from pypy.translator.js.node import LLVMNode
from pypy.translator.js.database import Database
Modified: pypy/dist/pypy/translator/js/node.py
==============================================================================
--- pypy/dist/pypy/translator/js/node.py (original)
+++ pypy/dist/pypy/translator/js/node.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
_nodename_count = {}
Modified: pypy/dist/pypy/translator/js/opaquenode.py
==============================================================================
--- pypy/dist/pypy/translator/js/opaquenode.py (original)
+++ pypy/dist/pypy/translator/js/opaquenode.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.js.node import LLVMNode, ConstantLLVMNode
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
class OpaqueNode(ConstantLLVMNode):
Modified: pypy/dist/pypy/translator/js/opwriter.py
==============================================================================
--- pypy/dist/pypy/translator/js/opwriter.py (original)
+++ pypy/dist/pypy/translator/js/opwriter.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import py
from pypy.objspace.flow.model import Constant
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
#from pypy.translator.js.module.extfunction import extfunctions
from pypy.translator.js.extfuncnode import ExternalFuncNode
from pypy.translator.js.log import log
Modified: pypy/dist/pypy/translator/js/structnode.py
==============================================================================
--- pypy/dist/pypy/translator/js/structnode.py (original)
+++ pypy/dist/pypy/translator/js/structnode.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import py
from pypy.translator.js.node import LLVMNode, ConstantLLVMNode
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.js.log import log
log = log.structnode
Modified: pypy/dist/pypy/translator/js/test/test_lltype.py
==============================================================================
--- pypy/dist/pypy/translator/js/test/test_lltype.py (original)
+++ pypy/dist/pypy/translator/js/test/test_lltype.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
import py
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.js.test.runtest import compile_function
from pypy.translator.js import database, codewriter
Modified: pypy/dist/pypy/translator/llvm/arraynode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/arraynode.py (original)
+++ pypy/dist/pypy/translator/llvm/arraynode.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
import py
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.log import log
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
from pypy.translator.llvm import varsize
Modified: pypy/dist/pypy/translator/llvm/backendopt/exception.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/backendopt/exception.py (original)
+++ pypy/dist/pypy/translator/llvm/backendopt/exception.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
from pypy.objspace.flow.model import Block, Constant, Variable, Link, \
last_exception, flatten, SpaceOperation
from pypy.annotation import model as annmodel
-from pypy.rpython.lltype import Bool, Ptr
+from pypy.rpython.lltypesystem.lltype import Bool, Ptr
n_calls = n_calls_patched = 0
Modified: pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py (original)
+++ pypy/dist/pypy/translator/llvm/backendopt/mergemallocs.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.objspace.flow.model import Block, flatten, SpaceOperation, Constant, Variable
-from pypy.rpython.lltype import Struct, GcStruct, Void, Ptr
+from pypy.rpython.lltypesystem.lltype import Struct, GcStruct, Void, Ptr
from pypy.translator.llvm.backendopt.support import log
Modified: pypy/dist/pypy/translator/llvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/database.py (original)
+++ pypy/dist/pypy/translator/llvm/database.py Tue Oct 25 16:05:11 2005
@@ -10,7 +10,7 @@
VoidArrayNode, ArrayTypeNode, VoidArrayTypeNode
from pypy.translator.llvm.opaquenode import OpaqueNode, OpaqueTypeNode
from pypy.translator.llvm.node import ConstantLLVMNode
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.objspace.flow.model import Constant, Variable
log = log.database
Modified: pypy/dist/pypy/translator/llvm/externs2ll.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/externs2ll.py (original)
+++ pypy/dist/pypy/translator/llvm/externs2ll.py Tue Oct 25 16:05:11 2005
@@ -4,7 +4,7 @@
import urllib
from pypy.rpython.rmodel import inputconst, getfunctionptr
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.codewriter import CodeWriter, \
DEFAULT_TAIL, DEFAULT_CCONV
Modified: pypy/dist/pypy/translator/llvm/funcnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/funcnode.py (original)
+++ pypy/dist/pypy/translator/llvm/funcnode.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
import sys
from pypy.objspace.flow.model import Block, Constant, Variable, Link
from pypy.objspace.flow.model import flatten, mkentrymap, traverse, last_exception
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
from pypy.translator.llvm.opwriter import OpWriter
from pypy.translator.llvm.log import log
Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py (original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py Tue Oct 25 16:05:11 2005
@@ -9,7 +9,7 @@
from pypy.translator.llvm.database import Database
from pypy.translator.llvm.pyxwrapper import write_pyx_wrapper
from pypy.rpython.rmodel import inputconst, getfunctionptr
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.tool.udir import udir
from pypy.translator.llvm.codewriter import CodeWriter, \
DEFAULT_TAIL, DEFAULT_CCONV
Modified: pypy/dist/pypy/translator/llvm/node.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/node.py (original)
+++ pypy/dist/pypy/translator/llvm/node.py Tue Oct 25 16:05:11 2005
@@ -1,4 +1,4 @@
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
class LLVMNode(object):
__slots__ = "".split()
Modified: pypy/dist/pypy/translator/llvm/opaquenode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/opaquenode.py (original)
+++ pypy/dist/pypy/translator/llvm/opaquenode.py Tue Oct 25 16:05:11 2005
@@ -1,5 +1,5 @@
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
class OpaqueTypeNode(LLVMNode):
Modified: pypy/dist/pypy/translator/llvm/opwriter.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/opwriter.py (original)
+++ pypy/dist/pypy/translator/llvm/opwriter.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import py
from pypy.objspace.flow.model import Constant
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.module.extfunction import extfunctions
from pypy.translator.llvm.extfuncnode import ExternalFuncNode
from pypy.translator.llvm.log import log
Modified: pypy/dist/pypy/translator/llvm/pyxwrapper.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/pyxwrapper.py (original)
+++ pypy/dist/pypy/translator/llvm/pyxwrapper.py Tue Oct 25 16:05:11 2005
@@ -1,6 +1,6 @@
import sys
from pypy.translator.llvm.log import log
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
log = log.pyrex
PRIMITIVES_TO_C = {lltype.Bool: "char",
Modified: pypy/dist/pypy/translator/llvm/structnode.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/structnode.py (original)
+++ pypy/dist/pypy/translator/llvm/structnode.py Tue Oct 25 16:05:11 2005
@@ -2,7 +2,7 @@
from pypy.translator.llvm.log import log
from pypy.translator.llvm.node import LLVMNode, ConstantLLVMNode
from pypy.translator.llvm import varsize
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
log = log.structnode
Modified: pypy/dist/pypy/translator/llvm/test/test_lltype.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/test/test_lltype.py (original)
+++ pypy/dist/pypy/translator/llvm/test/test_lltype.py Tue Oct 25 16:05:11 2005
@@ -1,7 +1,7 @@
import py
-from pypy.rpython import lltype
+from pypy.rpython.lltypesystem import lltype
from pypy.translator.llvm.test.runtest import compile_function
from pypy.translator.llvm import database, codewriter
Modified: pypy/dist/pypy/translator/simplify.py
==============================================================================
--- pypy/dist/pypy/translator/simplify.py (original)
+++ pypy/dist/pypy/translator/simplify.py Tue Oct 25 16:05:11 2005
@@ -14,7 +14,7 @@
if isinstance(arg, Variable):
return None
f = arg.value
- from pypy.rpython import lltype
+ from pypy.rpython.lltypesystem import lltype
if not isinstance(f, lltype._ptr):
return None
try:
More information about the Pypy-commit
mailing list