X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fregression.tc;h=fbc8a4ad6f5cdcf82e91eb1853eef8b931648a8d;hp=0dd485332e57f795ad3f092c039d19baff563aab;hb=ba93ca53361ed2f7e542ab78fcb3df86597dd9e5;hpb=39179e9fe5c616bbe38282bc06ecfa6e15916346

diff --git a/tests/regression.tc b/tests/regression.tc
index 0dd4853..fbc8a4a 100644
--- 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"
@@ -270,25 +270,26 @@ outdent !::= " "  outdent " "
            | " "  [~]*    "\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]++