[pypy-svn] r28276 - in pypy/dist/pypy/rpython: . lltypesystem ootypesystem

antocuni at codespeak.net antocuni at codespeak.net
Sun Jun 4 17:23:50 CEST 2006


Author: antocuni
Date: Sun Jun  4 17:23:49 2006
New Revision: 28276

Modified:
   pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
   pypy/dist/pypy/rpython/ootypesystem/rbuiltin.py
   pypy/dist/pypy/rpython/rbuiltin.py
Log:
(antocuni, nik)

Make the r_dict rtyping typesystem-specific.



Modified: pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rbuiltin.py	Sun Jun  4 17:23:49 2006
@@ -2,6 +2,7 @@
 from pypy.annotation import model as annmodel
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.lltypesystem import rclass
+from pypy.rpython.lltypesystem.rdict import rtype_r_dict
 from pypy.rpython import objectmodel
 from pypy.rpython.rmodel import TyperError, Constant
 from pypy.rpython.robject import pyobj_repr
@@ -64,3 +65,4 @@
 BUILTIN_TYPER[isinstance] = rtype_builtin_isinstance
 BUILTIN_TYPER[hasattr] = rtype_builtin_hasattr
 BUILTIN_TYPER[__import__] = rtype_builtin___import__
+BUILTIN_TYPER[objectmodel.r_dict] = rtype_r_dict

Modified: pypy/dist/pypy/rpython/ootypesystem/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/rbuiltin.py	Sun Jun  4 17:23:49 2006
@@ -1,7 +1,9 @@
 from pypy.annotation import model as annmodel
 from pypy.rpython.ootypesystem import ootype
 from pypy.rpython.ootypesystem import rclass
+from pypy.rpython.ootypesystem.rdict import rtype_r_dict
 from pypy.objspace.flow.model import Constant
+from pypy.rpython import objectmodel
 from pypy.rpython.error import TyperError
 
 def rtype_new(hop):
@@ -71,3 +73,4 @@
 BUILTIN_TYPER[ootype.runtimenew] = rtype_runtimenew
 BUILTIN_TYPER[ootype.ooidentityhash] = rtype_ooidentityhash
 BUILTIN_TYPER[isinstance] = rtype_builtin_isinstance
+BUILTIN_TYPER[objectmodel.r_dict] = rtype_r_dict

Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/rbuiltin.py	Sun Jun  4 17:23:49 2006
@@ -9,7 +9,6 @@
 from pypy.rpython import rstr
 from pypy.rpython import rptr
 from pypy.rpython.robject import pyobj_repr
-from pypy.rpython.lltypesystem.rdict import rtype_r_dict # TODO: typesystem?
 from pypy.tool import sourcetools
 from pypy.rpython import extregistry
 
@@ -445,7 +444,6 @@
 BUILTIN_TYPER[lltype.Ptr] = rtype_const_result
 BUILTIN_TYPER[lltype.runtime_type_info] = rtype_runtime_type_info
 BUILTIN_TYPER[rarithmetic.intmask] = rtype_intmask
-BUILTIN_TYPER[objectmodel.r_dict] = rtype_r_dict
 BUILTIN_TYPER[objectmodel.we_are_translated] = rtype_we_are_translated
 BUILTIN_TYPER[rstack.yield_current_frame_to_caller] = (
     rtype_yield_current_frame_to_caller)



More information about the Pypy-commit mailing list