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

diff --git a/tests/meta.g b/tests/meta.g
index 0e3bce7..f9e0e67 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,16 +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)
 
 conjuncts   ::=  sequence
               |  sequence ^"&"  e*/ws   /ws
               |  sequence ^"&~" e*/ws   /ws
 
-sequence    ::= e*/ws
-                (ws "/" e)?
-                (ws "=>" ws (word|quoted))?              => "seq"
+ps          ::= e*/ws => "ps"
+psx         ::= ps
+              > ps ^"/" e /ws
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -21,10 +22,10 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                           => "nonTerminal"
+e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
            |    ^"()"
-           |    ^"{" sequence "}"   /ws
+           |    ^"{" sequence "}"       /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws