[svn:parrot] r44908 - in branches/ops_pct: compilers/opsc/src/Ops/Compiler src/ops

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Mar 13 20:20:30 2010
New Revision: 44908
URL: https://trac.parrot.org/parrot/changeset/44908

Log:
Use 'goto ADDRESS' in find_method. 'restart ADDRESS' is broken in trunk

Modified:
   branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm
   branches/ops_pct/src/ops/pmc.ops

Modified: branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm
==============================================================================
--- branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm	Sat Mar 13 20:19:53 2010	(r44907)
+++ branches/ops_pct/compilers/opsc/src/Ops/Compiler/Actions.pm	Sat Mar 13 20:20:30 2010	(r44908)
@@ -338,6 +338,7 @@
     # expr ADDRERR($addr) -> expr_address($addr)
     # restart NEXT()      -> restart_offset(opsize()); goto_address(0)
     # restart OFFSET()    -> restart_offset($addr); goto_offset($addr)
+    # XXX In trunk "restart ADDRESS" equivalent of "goto ADDRESS".
     # restart ADDRESS()   -> restart_address($addr); goto_address($addr)
 
     my $macro_type := ~$<macro_type>;

Modified: branches/ops_pct/src/ops/pmc.ops
==============================================================================
--- branches/ops_pct/src/ops/pmc.ops	Sat Mar 13 20:19:53 2010	(r44907)
+++ branches/ops_pct/src/ops/pmc.ops	Sat Mar 13 20:20:30 2010	(r44908)
@@ -240,7 +240,7 @@
             VTABLE_get_string(interp, VTABLE_get_class(interp, $2)));
         goto ADDRESS(dest);
     }
-    restart ADDRESS(resume);
+    goto ADDRESS(resume);
 }
 
 ########################################