Fix CHECK phasers in r-value context; also move all CHECK handling in…

…to World.
rakudo · Mar 1, 2012 · d73f458 · d73f458
1 parent 01386ea
commit d73f458
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -881,7 +881,7 @@ class Perl6::Actions is HLL::Actions {
     }
 
     method statement_prefix:sym<BEGIN>($/) { make $*W.add_phaser($/, ($<blorst>.ast)<code_object>, 'BEGIN'); }
-    method statement_prefix:sym<CHECK>($/) { $*W.add_phaser($/, ($<blorst>.ast)<code_object>, 'CHECK'); }
+    method statement_prefix:sym<CHECK>($/) { make $*W.add_phaser($/, ($<blorst>.ast)<code_object>, 'CHECK'); }
     method statement_prefix:sym<INIT>($/)  { $*W.add_phaser($/, ($<blorst>.ast)<code_object>, 'INIT'); }
     method statement_prefix:sym<END>($/)   { $*W.add_phaser($/, ($<blorst>.ast)<code_object>, 'END'); }
 

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -425,10 +425,6 @@ grammar Perl6::Grammar is HLL::Grammar {
         :my $*POD_PAST;
         :my $*DECLARATOR_DOCS;
 
-        # CHECK phasers for this compilation unit we'll need at
-        # CHECK time.
-        :my @*CHECK_PHASERS := [];
-
         # Setting loading and symbol setup.
         {
             # Create unit outer (where we assemble any lexicals accumulated
@@ -494,7 +490,7 @@ grammar Perl6::Grammar is HLL::Grammar {
         }
 
         # CHECK time.
-        { for @*CHECK_PHASERS { $_() } }
+        { $*W.CHECK(); }
     }
 
     method import_EXPORTHOW($UNIT) {    

diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -51,6 +51,9 @@ class Perl6::World is HLL::World {
     # Cached constants that we've built.
     has %!const_cache;
 
+    # List of CHECK blocks to run.
+    has @!CHECKs;
+
     # Creates a new lexical scope and puts it on top of the stack.
     method push_lexpad($/) {
         # Create pad, link to outer and add to stack.
@@ -1139,7 +1142,10 @@ class Perl6::World is HLL::World {
             return self.add_constant_folded_result($result);
         }
         elsif $phaser eq 'CHECK' {
-            @*CHECK_PHASERS.unshift($block);
+            my $result_node := PAST::Stmt.new( PAST::Var.new( :name('Nil'), :scope('lexical_6model') ) );
+            @!CHECKs := [] unless @!CHECKs;
+            @!CHECKs.unshift([$block, $result_node]);
+            return $result_node;
         }
         elsif $phaser eq 'INIT' {
             $*UNIT[0].push(PAST::Op.new(
@@ -1159,6 +1165,14 @@ class Perl6::World is HLL::World {
         }
     }
 
+    # Runs the CHECK phasers and twiddles the PAST to look them up.
+    method CHECK() {
+        for @!CHECKs {
+            my $result := $_[0]();
+            $_[1][0] := self.add_constant_folded_result($result);
+        }
+    }
+
     # Adds required libraries to a compilation unit.
     method add_libs($comp_unit) {
         $comp_unit.loadlibs('nqp_group', 'nqp_ops', 'perl6_group', 'perl6_ops',