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

[nik at codespeak.net]

Author: nik
Date: Sat Apr 29 04:18:34 2006
New Revision: 26543

Modified:
   pypy/dist/pypy/rpython/lltypesystem/rstr.py
   pypy/dist/pypy/rpython/rstr.py
Log:
fix to the rstr reorganisation. this fixes a translation problem.
sorry about that.


Modified: pypy/dist/pypy/rpython/lltypesystem/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rstr.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rstr.py	Sat Apr 29 04:18:34 2006
@@ -1,5 +1,5 @@
 from pypy.rpython.rstr import AbstractStringRepr, STR, AbstractStringIteratorRepr, \
-        ll_strconcat
+        ll_strconcat, do_stringformat
 from pypy.rpython.lltypesystem.lltype import malloc, GcStruct, Ptr, Signed
 
 class StringRepr(AbstractStringRepr):

Modified: pypy/dist/pypy/rpython/rstr.py
==============================================================================
--- pypy/dist/pypy/rpython/rstr.py	(original)
+++ pypy/dist/pypy/rpython/rstr.py	Sat Apr 29 04:18:34 2006
@@ -247,7 +247,8 @@
         return hop.gendirectcall(llfn, v_str, v_index)
 
     def rtype_mod(_, hop):
-        return do_stringformat(hop, [(hop.args_v[1], hop.args_r[1])])
+        rstr = hop.rtyper.type_system.rstr
+        return rstr.do_stringformat(hop, [(hop.args_v[1], hop.args_r[1])])
 
 
 class __extend__(pairtype(AbstractStringRepr, SliceRepr)):
@@ -313,7 +314,8 @@
                          resulttype=Bool)
 
     def rtype_mod(_, hop):
-        return do_stringformat(hop, [(hop.args_v[1], hop.args_r[1])])
+        rstr = hop.rtyper.type_system.rstr
+        return rstr.do_stringformat(hop, [(hop.args_v[1], hop.args_r[1])])
 
 class __extend__(pairtype(AbstractStringRepr, CharRepr)):
     def rtype_contains(_, hop):
@@ -410,7 +412,8 @@
                               resulttype=r_arg)
             sourcevars.append((vitem, r_arg))
 
-        return do_stringformat(hop, sourcevars)
+        rstr = hop.rtyper.type_system.rstr
+        return rstr.do_stringformat(hop, sourcevars)
                 
 
 class __extend__(CharRepr):