X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=bb7cd114d94bf05ab028246df247490f0b38e86d;hp=7daac30281e79f14cb4e514e4c60aaacdc9065d4;hb=8ad399319f15cd179fa05a5052314a8f1d7df271;hpb=3a1b055a8866989b106195ac27021d58fcd1e555

diff --git a/tests/meta.g b/tests/meta.g
index 7daac30..bb7cd11 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,18 +7,13 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
 equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
-sequence    ::= e */ (w**)
-              > es ws ^"/" e
-es          ::= e */ (w**)
+conjuncts   ::=  sequence
+              |  sequence ^"&"  e*/ws   /ws
+              |  sequence ^"&~" e*/ws   /ws
 
-ss ::= es => "seq" | es ^"/" e /ws
-
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
-
-rewrite  ::=  sequence                     /ws => "rewrite"
-           |  sequence ^"=>" (word|quoted) /ws
+sequence    ::= e*/ws
+                (ws "/" e)?
+                (ws "=>" ws (word|quoted))?              => "seq"
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -49,8 +44,7 @@ w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
+word     ::= [a-zA-Z0-9_]++
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"