checkpoint

darcs-hash:20051213072147-5007d-8639ba75100cf773c6e030a8c71ef4ffa79bf1a5.gz

diff --git a/tests/meta.g b/tests/meta.g
index 05f3abf..e5a17b5 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,12 +1,12 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
 grammar   ::=  r+/ws => "grammar"
-r         ::=  word  ^"::=" Alternatives /ws
-            |  word ^"!::=" Alternatives /ws
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
 
 ec        ::=  [~\]\\\-\~] | escaped
 
-Alternatives  ::=  EquiAlt   +/ ">"
+alternatives  ::=  EquiAlt   +/ (ws ">" ws)
 EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 
 sequence    ::= Es
@@ -26,7 +26,7 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Alternatives "}"
+           |    ^"{" alternatives "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -45,7 +45,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Alternatives ")"
+           >    ^"(" alternatives ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"