Refactor check for curly brace statement terminator.

rakudo · Feb 28, 2009 · 36314e0 · 36314e0
1 parent dd9b61c
commit 36314e0
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/parser/grammar.pg b/src/parser/grammar.pg
@@ -194,13 +194,7 @@ token stdstopper {
 token eat_terminator {
     || ';'
     || <?terminator>
-    || <?{{ 
-          $P0 = get_global '$!endstmt'
-          $P1 = get_global '$!ws'
-          $P2 = $P1.'from'()
-          $I0 = iseq $P0, $P2
-          .return ($I0)
-       }}>
+    || <?AT_STATEMENT_END>
     || $
     || <.panic: "Statement not terminated properly">
 }
@@ -213,6 +207,17 @@ token MARK_STATEMENT_END {
     <.ws>
 }
 
+token AT_STATEMENT_END {
+    <?{{ 
+          $P0 = get_global '$!endstmt'
+          $P1 = get_global '$!ws'
+          $P2 = $P1.'from'()
+          $I0 = iseq $P0, $P2
+          .return ($I0)
+    }}>
+}
+
+
 
 ##  Parse a single statement, which may be either a bare block
 ##  or an expression.  Any statement termination is handled by