[svn:parrot] r32423 - trunk/languages/pipp/src/pct

[bernhard]

Author: bernhard
Date: Fri Nov  7 06:26:42 2008
New Revision: 32423

Modified:
   trunk/languages/pipp/src/pct/grammar.pg

Log:
Pipp: Refactor the <ws> rule using <!ww>


Modified: trunk/languages/pipp/src/pct/grammar.pg
==============================================================================
--- trunk/languages/pipp/src/pct/grammar.pg     (original)
+++ trunk/languages/pipp/src/pct/grammar.pg     Fri Nov  7 06:26:42 2008
@@ -9,10 +9,11 @@
 token TOP                   { ^ <sea_or_code>+                                 
      {*} }
 
 # whitespace and comments
-token ws                    { [ <.ws_char>
+token ws                    { <!ww> <ws_all>+ | <ws_all>* }
+token ws_all                { [ <.ws_char>
                               | <singlelinecomment>
                               | <multilinecomment>
-                              ]*
+                              ]
                             }
 token ws_char               { [ \h | \v ] }
 token singlelinecomment     { '#'  \N*
@@ -66,7 +67,7 @@
                             | <before '?'>
                             | $
                             }
-rule  echo_statement        { 'echo'<ws_char>+<arguments> 
<.statement_delimiter>     {*} }
+rule  echo_statement        { 'echo' <arguments> <.statement_delimiter>        
      {*} }
 rule  expression_statement  { <expression> <.statement_delimiter>              
      {*} }
 rule  arguments             { [ <expression> [',' <expression>]* ]?            
      {*} }
 rule  if_statement          { 'if' '(' <expression> ')' <block> <else_clause>? 
      {*} }