checkpoint

darcs-hash:20051213070007-5007d-90a6a1aa30ffd7c09ce91ee4e79a3ce30a5effb2.gz

diff --git a/tests/meta.g b/tests/meta.g
index 7b1595d..fecabcf 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -10,17 +10,18 @@ ec        ::=  [~\]\\\-\~] | escaped
 Alternatives  ::=  EquiAlt   +/ ">"
 EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 
 Alternatives  ::=  EquiAlt   +/ ">"
 EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 

-Sequence    ::= E+ ^"/" E
-              > E+
+sequence    ::= Es ^"/" E   /ws
+              > Es
+Es ::= E+

 
 Conjuncts   ::=  rewrite
 
 Conjuncts   ::=  rewrite

-              |  rewrite ^"&"  Sequence
-              |  rewrite ^"&~" Sequence
+              |  rewrite ^"&"  sequence
+              |  rewrite ^"&~" sequence

 
 

-rewrite  ::=  Sequence                  /ws        => "rewrite"
-           |  Sequence ^"=>" word       /ws
-           |  Sequence ^"=>" quoted     /ws
-           |  Sequence  "=>" "()"       /ws        => "wrap"
+rewrite  ::=  sequence                  /ws        => "rewrite"
+           |  sequence ^"=>" word       /ws
+           |  sequence ^"=>" quoted     /ws
+           |  sequence  "=>" "()"       /ws        => "wrap"

 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"