checkpoint

darcs-hash:20051213073407-5007d-c9e25fb716b6734bfdd6e1620a52f125d2c2936d.gz

diff --git a/tests/regression.tc b/tests/regression.tc
index 0dd4853..32e8a59 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -218,7 +218,7 @@ testcase {
     l  ::= id
     s  ::= l "=" r  => "assign"
          | r
     l  ::= id
     s  ::= l "=" r  => "assign"
          | r

-    R  ::= l
+    r  ::= l

          | l "=" r       => "assign"
          | r "+" r       => "plus"
          | (r) "*" r       => "times"
          | l "=" r       => "assign"
          | r "+" r       => "plus"
          | (r) "*" r       => "times"

@@ -272,13 +272,14 @@ outdent !::= " "  outdent " "
 any      !::= [~]*
 s         ::= !any "\n\n" !ww Statement !ww "\n\n" !any => smt
 ww        ::= sp*
 any      !::= [~]*
 s         ::= !any "\n\n" !ww Statement !ww "\n\n" !any => smt
 ww        ::= sp*

+ws       !::= sp**

 sp        ::= " "
 
 sp        ::= " "
 

-block     ::= "\n" !indent  BlockBody
+block     ::= "\n" !indent  blockBody

            &~ "\n" outdent [~\ ] [~]*
 
            &~ "\n" outdent [~\ ] [~]*
 

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

 
 Statement ::= Call
             | ^"while" Expr block
 
 Statement ::= Call
             | ^"while" Expr block