checkpoint

darcs-hash:20051219062558-5007d-93c254e34f0b70f3b757a2eaef0792a59311da0a.gz

diff --git a/tests/meta.g b/tests/meta.g
index f9e0e67..c9d588d 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -29,7 +29,7 @@ e        ::=  word                          => "nonTerminal"
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws

-           |    ^"!" e                  /ws
+//           |    ^"!" e                  /ws

 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws

diff --git a/tests/regression.tc b/tests/regression.tc
index 6196b48..9a7ef50 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -286,12 +286,12 @@ outdent !::= " "  outdent " "
            | " "  ([~]*)  "\n"
 
 any      !::= [~]*
            | " "  ([~]*)  "\n"
 
 any      !::= [~]*

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

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

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

            &~ "\n" outdent [~\ ] [~]*
 
 blockBody ::= statement
            &~ "\n" outdent [~\ ] [~]*
 
 blockBody ::= statement