checkpoint

[sbp.git] / tests / regression.tc

diff --git a/tests/regression.tc b/tests/regression.tc
index 0dd4853..c807a7a 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -218,7 +218,7 @@ testcase {
     l  ::= id
     s  ::= l "=" r  => "assign"
          | r
-    R  ::= l
+    r  ::= l
          | l "=" r       => "assign"
          | r "+" r       => "plus"
          | (r) "*" r       => "times"
@@ -267,28 +267,29 @@ testcase {
 
 indent  !::= ww
 outdent !::= " "  outdent " "
-           | " "  [~]*    "\n"
+           | " "  ([~]*)  "\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        ::= " "
 
-block     ::= "\n" !indent  BlockBody
+block     ::= "\n" !indent  blockBody
            &~ "\n" outdent [~\ ] [~]*
 
-BlockBody ::= Statement
-            > Statement BlockBody => "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
 
-Call      ::= Expr "()"
+call      ::= expr "()"        /ws
 
 num       ::= [0-9]++