Further refactoring of unitstart and outer lexical handling.

rakudo · Jul 5, 2010 · a7c6953 · a7c6953
1 parent 7bdeadf
commit a7c6953
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -136,7 +136,15 @@ method comp_unit($/, $key?) {
 }
 
 method unitstart($/) {
+    # Create a block for the compilation unit.
     self.newpad($/);
+    # Use SET_BLOCK_OUTER_CTX (inherited from HLL::Actions)
+    # to set dynamic outer lexical context and namespace details
+    # for the compilation unit.
+    self.SET_BLOCK_OUTER_CTX(@BLOCK[0]);
+
+    self.newpad($/);
+    self.finishpad($/);
 }
 
 method statementlist($/) {
@@ -284,12 +292,6 @@ method newpad($/) {
     @BLOCK.unshift($new_block);
 }
 
-method outerlex($/) {
-    # Use SET_BLOCK_OUTER_CTX (inherited from HLL::Actions)
-    # to set dynamic outer lexical context and namespace details
-    # for the compilation unit.
-    self.SET_BLOCK_OUTER_CTX(@BLOCK[0]);
-}
 
 method finishpad($/) {
     # Generate the $_, $/, and $! lexicals if they aren't already

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -282,7 +282,6 @@ token comp_unit {
     :my $*UNITPAST;
     <.unitstart>
     <.newpad>
-    <.outerlex>
     <.finishpad>
     {*} #= open
     <statementlist>
@@ -360,7 +359,6 @@ token blockoid {
 
 token unitstart { <?> }
 token newpad { <?> }
-token outerlex { <?> }
 token finishpad { <?> }
 
 proto token terminator { <...> }