Implement START term; small refactoring so we can use same code as fo…

…r START statement.
rakudo · Apr 2, 2009 · 46987f7 · 46987f7
1 parent 3ad32e1
commit 46987f7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 17 deletions.
diff --git a/src/parser/actions.pm b/src/parser/actions.pm
@@ -432,23 +432,7 @@ method begin_statement($/) {
 }
 
 method start_statement($/) {
-    # Create block.
-    my $past := $( $<block> );
-    $past.blocktype('immediate');
-    declare_implicit_routine_vars($past);
-
-    # Mark block as needing to load state.
-    our @?BLOCK;
-    block_has_state(@?BLOCK[0]);
-
-    # We now need to emit code to run the block only once, and store the
-    # result. We'll just piggy-back off state vars.
-    make PAST::Var.new(
-        :scope('state'),
-        :name($past.unique('start_block_')),
-        :viviself($past),
-        :isdecl(1)
-    );
+    make make_start_block($/);
 }
 
 method end_statement($/) {
@@ -2503,6 +2487,11 @@ method term($/, $key) {
 }
 
 
+method term_START($/) {
+    make make_start_block($/);
+}
+
+
 method args($/, $key) {
     my $past := build_call( $key eq 'func args'
         ?? $($<semilist>)
@@ -3181,6 +3170,27 @@ sub prevent_null_return($block) {
 }
 
 
+# This makes a START block (factored out since used as a term and a statement).
+sub make_start_block($/) {
+    # Create block.
+    my $past := $( $<block> );
+    $past.blocktype('immediate');
+    declare_implicit_routine_vars($past);
+
+    # Mark block as needing to load state.
+    our @?BLOCK;
+    block_has_state(@?BLOCK[0]);
+
+    # We now need to emit code to run the block only once, and store the
+    # result. We'll just piggy-back off state vars.
+    return PAST::Var.new(
+        :scope('state'),
+        :name($past.unique('start_block_')),
+        :viviself($past),
+        :isdecl(1)
+    );
+}
+
 # This takes a block and ensures we emit code to load any associated state
 # (START blocks, state variables) at block entry.
 sub block_has_state($block) {

diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -638,6 +638,7 @@ token noun {
 token term {
     [
     | 'VAR(' <variable> ')' {*}                  #= VAR
+    | <term_START> {*}                           #= term_START
     | <name=named_0ary>
         [
         | <.unsp>? '.'? '(' <semilist> ')' {*}   #= func args
@@ -655,6 +656,11 @@ token term {
 }
 
 
+rule term_START {
+    $<sym>=[START] <block> {*}
+}
+
+
 token args {
     | \s <arglist> {*}                           #= listop args
     | <.unsp>? '.'? '(' <semilist> ')' {*}       #= func args