compile methods to anonymous PIR subs

Raku · May 13, 2011 · bb72006 · bb72006
1 parent ad31d07
commit bb72006
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/HLL/Grammar.pm b/src/HLL/Grammar.pm
@@ -570,7 +570,6 @@ An operator precedence parser.
             here.'!cursor_debug'('START', 'EXPR')
           debug_1:
 
-            .const 'Sub' reduce = 'EXPR_reduce'
             .local string termishrx
             termishrx = 'termish'
 
@@ -679,17 +678,15 @@ An operator precedence parser.
             $P0 = $P0['O']
             opprec = $P0['prec']
             unless opprec > inprec goto reduce_gt_done
-            capture_lex reduce
-            self.reduce(termstack, opstack)
+            self.'EXPR_reduce'(termstack, opstack)
             goto reduce_loop
           reduce_gt_done:
 
             unless opprec == inprec goto reduce_done
             # equal precedence, use associativity to decide
             unless inassoc == 'left' goto reduce_done
             # left associative, reduce immediately
-            capture_lex reduce
-            self.reduce(termstack, opstack)
+            self.'EXPR_reduce'(termstack, opstack)
           reduce_done:
 
             push opstack, infix        # The Shift
@@ -699,8 +696,7 @@ An operator precedence parser.
 
           opstack_loop:
             unless opstack goto opstack_done
-            capture_lex reduce
-            self.reduce(termstack, opstack)
+            self.'EXPR_reduce'(termstack, opstack)
             goto opstack_loop
           opstack_done:
 

diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -809,6 +809,12 @@ class NQP::Actions is HLL::Actions {
             # Install it in the package also if needed.
             if $*SCOPE eq 'our' {
                 $*SC.install_package_routine($*PACKAGE, $name, $past);
+            } else {
+                if $past.pirflags() {
+                    $past.pirflags(~$past.pirflags() ~ ":anon");
+                } else {
+                    $past.pirflags(":anon");
+                }
             }
         }