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

diff --git a/tests/meta.g b/tests/meta.g
index 03bd717..f9e0e67 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,20 +4,17 @@ grammar   ::=  r +/ ws                        => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)
+alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-sequence    ::= e */ (w**)
-              > e */ (w**) ws ^"/" e
+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
+ps          ::= e*/ws => "ps"
+psx         ::= ps
+              > ps ^"/" e /ws
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -25,9 +22,10 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
-           |    ^"{" alternatives "}"   /ws
+e        ::=  word                          => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
@@ -39,17 +37,14 @@ e        ::= word                             => "nonTerminal"
            |  e ^"+/" e                 /ws
            |  e ^"?"                    /ws
 
-           |  quoted                        => "literal"
-
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
+word     ::= [a-zA-Z0-9_]++
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"