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

diff --git a/tests/meta.g b/tests/meta.g
index fa2b98f..359319d 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,18 +7,15 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
 equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
-
-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"
+
+rewrite  ::=  sequence
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -49,8 +46,7 @@ w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
+word     ::= [a-zA-Z0-9_]++
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"