[svn:parrot] r40244 - in branches/bsr_jsr_ret: runtime/parrot/library/PGE t/op

[whiteknight at svn.parrot.org]

Author: whiteknight
Date: Fri Jul 24 00:15:43 2009
New Revision: 40244
URL: https://trac.parrot.org/parrot/changeset/40244

Log:
[bsr_jsr_ret] fix some stuff that I broke because I'm not doing good work like I should be

Modified:
   branches/bsr_jsr_ret/runtime/parrot/library/PGE/Hs.pir
   branches/bsr_jsr_ret/t/op/sprintf.t
   branches/bsr_jsr_ret/t/op/string.t

Modified: branches/bsr_jsr_ret/runtime/parrot/library/PGE/Hs.pir
==============================================================================
--- branches/bsr_jsr_ret/runtime/parrot/library/PGE/Hs.pir	Fri Jul 24 00:04:19 2009	(r40243)
+++ branches/bsr_jsr_ret/runtime/parrot/library/PGE/Hs.pir	Fri Jul 24 00:15:43 2009	(r40244)
@@ -165,6 +165,8 @@
     .local int tmpi, cond
     .local string tmps, key
     .local pmc capt, it, subelm, elm
+    .local pmc jmpstack
+    jmpstack = new 'ResizableIntegerArray'
 
     out = ""
 
@@ -192,8 +194,6 @@
     cond = defined capt[spi]
     unless cond goto subpats_fail
     elm = capt[spi]
-    .local pmc jmpstack
-    jmpstack = new 'ResizableIntegerArray'
     local_branch jmpstack, dumper
     inc spi
     goto subpats_loop
@@ -245,7 +245,7 @@
     local_return jmpstack
   dumper_fail:
     out .= PGE_FAIL
-    ret
+    local_return jmpstack
   dumper_done:
     out .= "]"
     local_return jmpstack

Modified: branches/bsr_jsr_ret/t/op/sprintf.t
==============================================================================
--- branches/bsr_jsr_ret/t/op/sprintf.t	Fri Jul 24 00:04:19 2009	(r40243)
+++ branches/bsr_jsr_ret/t/op/sprintf.t	Fri Jul 24 00:15:43 2009	(r40244)
@@ -308,7 +308,7 @@
 
   reset_todo_info:
     todo_info = new 'Hash'
-    ret
+    local_return jmpstack
 
   set_todo_loop:
     if $I0 > $I1 goto end_loop
@@ -316,7 +316,7 @@
     $I0 += 1
     goto set_todo_loop
   end_loop:
-    ret
+    local_return jmpstack
 .end
 
 
@@ -386,7 +386,7 @@
 
   reset_skip_info:
     skip_info = new 'Hash'
-    ret
+    local_return jmpstack
 
   set_skip_loop:
     if $I0 > $I1 goto end_loop
@@ -398,7 +398,7 @@
     goto set_skip_loop
   end_loop:
     $S0 = ''
-    ret
+    local_return jmpstack
 .end
 
 

Modified: branches/bsr_jsr_ret/t/op/string.t
==============================================================================
--- branches/bsr_jsr_ret/t/op/string.t	Fri Jul 24 00:04:19 2009	(r40243)
+++ branches/bsr_jsr_ret/t/op/string.t	Fri Jul 24 00:15:43 2009	(r40244)
@@ -1783,23 +1783,23 @@
 NEWARYP:
     new P1, 'ResizablePMCArray'
     set P1[0], P0
-    ret
+    local_return P4
 NEWARYS:
     new P1, 'ResizablePMCArray'
     set P1[0], S0
-    ret
+    local_return P4
 NEWARYI:
     new P1, 'ResizablePMCArray'
     set P1[0], I0
-    ret
+    local_return P4
 NEWARYN:
     new P1, 'ResizablePMCArray'
     set P1[0], N0
-    ret
+    local_return P4
 PRINTF:
     sprintf S2, S1, P1
     print S2
-    ret
+    local_return P4
 
 MAIN:
     new P4, 'ResizableIntegerArray'
@@ -1928,7 +1928,7 @@
 PRINTF:
     sprintf P3, P2, P1
     print P3
-    ret
+    local_return P4
 
 MAIN:
     new P4, 'ResizableIntegerArray'