[pypy-svn] r54431 - pypy/branch/io-improvements/pypy/rpython/lltypesystem

[fijal at codespeak.net]

Author: fijal
Date: Mon May  5 10:42:42 2008
New Revision: 54431

Modified:
   pypy/branch/io-improvements/pypy/rpython/lltypesystem/rstr.py
Log:
* Fix buggy memcopy
* Leave clearer comment and explosion if tried with unicode


Modified: pypy/branch/io-improvements/pypy/rpython/lltypesystem/rstr.py
==============================================================================
--- pypy/branch/io-improvements/pypy/rpython/lltypesystem/rstr.py	(original)
+++ pypy/branch/io-improvements/pypy/rpython/lltypesystem/rstr.py	Mon May  5 10:42:42 2008
@@ -16,7 +16,6 @@
      staticAdtMethod, GcForwardReference
 from pypy.rpython.rmodel import Repr
 from pypy.rpython.lltypesystem import llmemory
-from pypy.rlib.objectmodel import we_are_translated
 from pypy.tool.sourcetools import func_with_new_name
 
 # ____________________________________________________________
@@ -312,13 +311,13 @@
         return result
 
     def ll_upper(s):
-        # XXX WUAAAA! this is not true anymore for unicode
         s_chars = s.chars
         s_len = len(s_chars)
         if s_len == 0:
             return s.empty()
         i = 0
-        result = s.malloc(s_len)
+        result = mallocstr(s_len)
+        #        ^^^^^^^^^ specifically to explode on unicode
         while i < s_len:
             ch = s_chars[i]
             if 'a' <= ch <= 'z':
@@ -328,13 +327,13 @@
         return result
 
     def ll_lower(s):
-        # XXX WUAAAA! this is not true anymore for unicode
         s_chars = s.chars
         s_len = len(s_chars)
         if s_len == 0:
             return s.empty()
         i = 0
-        result = s.malloc(s_len)
+        result = mallocstr(s_len)
+        #        ^^^^^^^^^ specifically to explode on unicode
         while i < s_len:
             ch = s_chars[i]
             if 'A' <= ch <= 'Z':
@@ -606,7 +605,7 @@
         while i < num_items:
             item_chars = items[i].chars
             item_len = len(item_chars)
-            copy_contents(result, items[i], res_index, 0, item_len)
+            copy_contents(items[i], result, 0, res_index, item_len)
             res_index += item_len
             i += 1
         return result