[pypy-svn] r15480 - pypy/dist/pypy/rpython

[hpk at codespeak.net]

Author: hpk
Date: Sun Jul 31 17:18:09 2005
New Revision: 15480

Modified:
   pypy/dist/pypy/rpython/rlist.py
   pypy/dist/pypy/rpython/rtyper.py
Log:
(hpk, arigo)

Oups, missing from previous check-in.


Modified: pypy/dist/pypy/rpython/rlist.py
==============================================================================
--- pypy/dist/pypy/rpython/rlist.py	(original)
+++ pypy/dist/pypy/rpython/rlist.py	Sun Jul 31 17:18:09 2005
@@ -731,3 +731,8 @@
         raise StopIteration
     iter.index = index + 1
     return l.items[index]
+            
+# ___________________________________________________________
+
+LIST_OF_STR = GcStruct("list", 
+                       ("items", Ptr(GcArray(Ptr(rstr.STR)))))

Modified: pypy/dist/pypy/rpython/rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/rtyper.py	(original)
+++ pypy/dist/pypy/rpython/rtyper.py	Sun Jul 31 17:18:09 2005
@@ -267,13 +267,15 @@
         # insert the needed conversions on the links
         can_insert_here = block.exitswitch is None and len(block.exits) == 1
         for link in block.exits:
-            if block.exitswitch is not None and link.exitcase is not None:
+            if link.exitcase is not None:
                 if isinstance(block.exitswitch, Variable):
                     r_case = self.bindingrepr(block.exitswitch)
                 else:
                     assert block.exitswitch == Constant(last_exception)
                     r_case = rclass.get_type_repr(self)
                 link.llexitcase = r_case.convert_const(link.exitcase)
+            else:
+                link.llexitcase = None
 
             a = link.last_exception
             if isinstance(a, Variable):