X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=03bd717eb9acf1410412b3de60be876ec8d5d3af;hp=7afdbc443506e7d7ff4e7f13d0fb1c8b7e4c2a10;hb=ee2f84c26849ceecf34826f6a2b4f5e1d03a0f2b;hpb=fc28000b13f531d55e0509a596ce5ad96c63bbf2

diff --git a/tests/meta.g b/tests/meta.g
index 7afdbc4..03bd717 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,19 +7,17 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
 equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
+sequence    ::= e */ (w**)
+              > e */ (w**) ws ^"/" e
 
-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
+rewrite  ::=  sequence                     /ws => "rewrite"
+           |  sequence ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -33,12 +31,8 @@ e        ::= word                             => "nonTerminal"
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
-           |  e ^"~/~"                  /ws
            |    ^"!" e                  /ws
 
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")