checkpoint

darcs-hash:20051213073534-5007d-82abe224517b8dd1e12b583a3eb57ef74beaa8d3.gz

diff --git a/tests/regression.tc b/tests/regression.tc
index 32e8a59..fbc8a4a 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -270,7 +270,7 @@ outdent !::= " "  outdent " "
            | " "  [~]*    "\n"
 
 any      !::= [~]*
            | " "  [~]*    "\n"
 
 any      !::= [~]*

-s         ::= !any "\n\n" !ww Statement !ww "\n\n" !any => smt
+s         ::= !any "\n\n" !ww statement !ww "\n\n" !any => smt

 ww        ::= sp*
 ws       !::= sp**
 sp        ::= " "
 ww        ::= sp*
 ws       !::= sp**
 sp        ::= " "

@@ -278,18 +278,18 @@ sp        ::= " "
 block     ::= "\n" !indent  blockBody
            &~ "\n" outdent [~\ ] [~]*
 
 block     ::= "\n" !indent  blockBody
            &~ "\n" outdent [~\ ] [~]*
 

-blockBody ::= Statement
-            > Statement blockBody /ws => "sbb"
+blockBody ::= statement
+            > statement blockBody /ws => "sbb"

 
 

-Statement ::= Call
-            | ^"while" Expr block
+statement ::= call
+            | ^"while" expr block /ws

 
 

-Expr      ::= ident
-            | Call
-            | Expr ^">" Expr
+expr      ::= ident
+            | call
+            | expr ^">" expr   /ws

             | num
 
             | num
 

-Call      ::= Expr "()"
+call      ::= expr "()"        /ws

 
 num       ::= [0-9]++
 
 
 num       ::= [0-9]++