Fix thunk building, so BEGIN say 1 + 2 will work.

rakudo · Jul 26, 2011 · eb38b99 · eb38b99
1 parent bbde437
commit eb38b99
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -660,7 +660,7 @@ class Perl6::Actions is HLL::Actions {
     }
 
     method blorst($/) {
-        make $<block> ?? $<block>.ast !! make_thunk_ref($<statement>.ast);
+        make $<block> ?? $<block>.ast !! make_thunk_ref($<statement>.ast, $/);
     }
 
     # Statement modifiers
@@ -1749,7 +1749,7 @@ class Perl6::Actions is HLL::Actions {
 
     method default_value($/) {
         # Turn into a thunk.
-        make make_thunk($<EXPR>.ast);
+        make make_thunk($<EXPR>.ast, $/);
     }
 
     method type_constraint($/) {
@@ -3204,12 +3204,17 @@ class Perl6::Actions is HLL::Actions {
         return $closure;
     }
 
-    sub make_thunk($to_thunk) {
-        make_simple_code_object(PAST::Block.new( $to_thunk ), 'Code');
+    sub make_thunk($to_thunk, $/) {
+        my $block := $*ST.push_lexpad($/);
+        $block.push($to_thunk);
+        $*ST.pop_lexpad();
+        make_simple_code_object($block, 'Code');
     }
 
-    sub make_thunk_ref($to_thunk) {
-        my $block := PAST::Block.new( $to_thunk );
+    sub make_thunk_ref($to_thunk, $/) {
+        my $block := $*ST.push_lexpad($/);
+        $block.push($to_thunk);
+        $*ST.pop_lexpad();
         reference_to_code_object(
             make_simple_code_object($block, 'Code'),
             $block);