Changeset 22258 for src/perl6

Timestamp:

09/15/08 20:57:35 (3 months ago)

Author:

lwall

Message:

[STD] remove redundant befores from terminators per pmichaud++

Files:

• src/perl6/STD.pm (modified) (2 diffs)

src/perl6/STD.pm

@@ -696 +696 @@
     || ';'
     || <?{ $¢.<_>[$¢.pos]<endstmt> }>
-    || <?before <terminator>>
+    || <?terminator>
     || $
     || {{ if $¢.<_>[$¢.pos]<ws> { $¢.pos = $¢.<_>[$¢.pos]<ws>; } }}   # undo any line transition
@@ -3281 +3281 @@
 
 ## expression terminator
+# Note: must always be called as <?terminator> or <?before ...<terminator>...>
 
 token terminator:sym<;> ( --> Terminator)
-    { <?before ';' > }
+    { ';' }
 
 token terminator:sym<if> ( --> Terminator)
-    { <?before 'if' » > }
+    { 'if' » }
 
 token terminator:sym<unless> ( --> Terminator)
-    { <?before 'unless' » > }
+    { 'unless' » }
 
 token terminator:sym<while> ( --> Terminator)
-    { <?before 'while' » > }
+    { 'while' » }
 
 token terminator:sym<until> ( --> Terminator)
-    { <?before 'until' » > }
+    { 'until' » }
 
 token terminator:sym<for> ( --> Terminator)
-    { <?before 'for' » > }
+    { 'for' » }
 
 token terminator:sym<given> ( --> Terminator)
-    { <?before 'given' » > }
+    { 'given' » }
 
 token terminator:sym<when> ( --> Terminator)
-    { <?before 'when' » > }
+    { 'when' » }
 
 token terminator:sym« --> » ( --> Terminator)
-    { <?before '-->' > {*} }              #'
+    { '-->' {*} }              #'
 
 token terminator:sym<)> ( --> Terminator)
-    { <?before <sym> > }
+    { <sym> }
 
 token terminator:sym<]> ( --> Terminator)
-    { <?before ']' > }
+    { ']' }
 
 token terminator:sym<}> ( --> Terminator)
-    { <?before '}' > }
+    { '}' }
 
 token terminator:sym<!!> ( --> Terminator)
-    { <?before '!!' > <?{ $+GOAL eq '!!' }> }
+    { '!!' <?{ $+GOAL eq '!!' }> }
 
 regex infixstopper {