checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index a0585bd..f709a77 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -9,13 +9,13 @@ equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
 
 sequence    ::= es
               > es ws ^"/" e
-es          ::= e %% (w**)
+es          ::= e */ (w**)
 
 ss ::= es | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e%%ws   /ws
-              |  rewrite ^"&~" e%%ws   /ws
+              |  rewrite ^"&"  e*/ws   /ws
+              |  rewrite ^"&~" e*/ws   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
@@ -25,16 +25,14 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
 ec       ::= [~\-\]\\\~]
            | escaped
 
-range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range1"
+range    ::= ec          => "range"
+           | ec ^"-" ec
 
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "["  (range*) "]" => "range"
-           |     "[~" (range*) "]" => "rangex"
-           |  e ^"%%" e                 /ws
-           |  e ^"$$" e                 /ws
+           |     "["  (range*) "]" => "ranges"
+           |     "[~" (range*) "]" => "rangesx"
            |  e ^"+/" e                 /ws
            |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws