X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=fa2b98f03e6e9cd8c9d47b53d9ac153d3b08a3ec;hp=c40600f8feeb2e78e56f66d764e33064a152e453;hb=cb5151d11037144c14809f6516ce5c1f1976ef7f;hpb=75436cc6e44f18083d834a3c92b1e99a53e94b66

diff --git a/tests/meta.g b/tests/meta.g
index c40600f..fa2b98f 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -11,16 +11,14 @@ sequence    ::= es
               > es ws ^"/" e
 es          ::= e */ (w**)
 
-ss ::= es | es ^"/" e /ws
+ss ::= es => "seq" | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
               |  rewrite ^"&"  e*/ws   /ws
               |  rewrite ^"&~" e*/ws   /ws
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
+rewrite  ::=  sequence                     /ws        => "rewrite"
+           |  sequence ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -28,18 +26,14 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminalY"
+e        ::= word                             => "nonTerminal"
            |    [(][)]                        => "epsilon"
            |    ^"{" alternatives "}"   /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
-           |  e ^"~/~"                  /ws
            |    ^"!" e                  /ws
 
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")