[svn:parrot] r32230 - in trunk/runtime/parrot/library: . Data PGE YAML

Author: pmichaud
Date: Wed Oct 29 06:18:32 2008
New Revision: 32230

Modified:
   trunk/runtime/parrot/library/Data/Dumper.pir
   trunk/runtime/parrot/library/Iter.pir
   trunk/runtime/parrot/library/P6object.pir
   trunk/runtime/parrot/library/PGE/Perl6Grammar.pir
   trunk/runtime/parrot/library/YAML/Dumper.pir

Log:
Various push_eh/pop_eh updates in runtime/parrot/library/ .


Modified: trunk/runtime/parrot/library/Data/Dumper.pir
==============================================================================
--- trunk/runtime/parrot/library/Data/Dumper.pir        (original)
+++ trunk/runtime/parrot/library/Data/Dumper.pir        Wed Oct 29 06:18:32 2008
@@ -45,6 +45,7 @@
     .return ( 1 )
 
 ERROR2:
+    pop_eh
     print "can not find class Data::Dumper::Default!\n"
     end
     .return ( 0 )

Modified: trunk/runtime/parrot/library/Iter.pir
==============================================================================
--- trunk/runtime/parrot/library/Iter.pir       (original)
+++ trunk/runtime/parrot/library/Iter.pir       Wed Oct 29 06:18:32 2008
@@ -107,7 +107,8 @@
     goto return
 
   eh_exhausted:
-    get_results '0,0', $P0, $S0
+    .get_results ($P0)
+    pop_eh
   exhausted:
     $P99 = getattribute self, 'exhausted'
     inc $P99

Modified: trunk/runtime/parrot/library/P6object.pir
==============================================================================
--- trunk/runtime/parrot/library/P6object.pir   (original)
+++ trunk/runtime/parrot/library/P6object.pir   Wed Oct 29 06:18:32 2008
@@ -219,9 +219,10 @@
   method_loop:
     unless methoditer goto mro_loop
     $S0 = shift methoditer
-    push_eh method_loop
+    push_eh method_next
     $P0 = methods[$S0]
     parrotclassns.'add_sub'($S0, $P0)
+  method_next:
     pop_eh
     goto method_loop
   mro_end:

Modified: trunk/runtime/parrot/library/PGE/Perl6Grammar.pir
==============================================================================
--- trunk/runtime/parrot/library/PGE/Perl6Grammar.pir   (original)
+++ trunk/runtime/parrot/library/PGE/Perl6Grammar.pir   Wed Oct 29 06:18:32 2008
@@ -187,8 +187,8 @@
           .local pmc p6meta
           p6meta = get_hll_global 'P6metaclass'
           p6meta.'new_class'('%0', 'parent'=>'%1')
-          pop_eh
         %2:
+          pop_eh
         CODE
   ns_optable:
     $P0 = ns['optable']

Modified: trunk/runtime/parrot/library/YAML/Dumper.pir
==============================================================================
--- trunk/runtime/parrot/library/YAML/Dumper.pir        (original)
+++ trunk/runtime/parrot/library/YAML/Dumper.pir        Wed Oct 29 06:18:32 2008
@@ -48,6 +48,7 @@
     .return ( 1 )
 
 ERROR2:
+    pop_eh
     print "can not find class YAML::Dumper::Default!\n"
     end
     .return ( 0 )