[pypy-svn] r66071 - pypy/branch/pyjitpl5/pypy/rpython/lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:39:46 2009
New Revision: 66071

Added:
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/rpython/lltypesystem/rstr.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65749 | cfbolz | 2009-06-12 17:28:30 +0200 (Fri, 12 Jun 2009) | 4 lines
    
    Use the same splitlines implementation for ootypesystem and lltypesystem. This allows us to
    not have to implement it in all the ootype backends. Thus kill the JVM
    implementation.
    
    ------------------------------------------------------------------------
    r65706 | benjamin | 2009-06-10 02:09:32 +0200 (Wed, 10 Jun 2009) | 1 line
    
    implement str.splitlines() for rpython
    ------------------------------------------------------------------------
    r65525 | pedronis | 2009-06-01 08:22:12 +0200 (Mon, 01 Jun 2009) | 5 lines
    
    reverting 65522, it broke a couple tests in applevel and lib-python tests
    
    not completely clear why, in general our error code is not that well tested by our own tests
    
    
    ------------------------------------------------------------------------
    r65522 | benjamin | 2009-06-01 02:00:54 +0200 (Mon, 01 Jun 2009) | 1 line
    
    normalize raise statements
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rstr.py.merge.tmp	Tue Jun 30 16:39:46 2009
@@ -664,6 +664,7 @@
         s1.copy_contents(s1, newstr, 0, 0, newlen)
         return newstr
 
+
     def ll_split_chr(LIST, s, c):
         chars = s.chars
         strlen = len(chars)