X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=4b4df1fef16a16bc450ef07ff99a1ef4e406c438;hp=2779b7c8f6a618a4d0a879580376179b40c10cc1;hb=6f995008673ec682df49866ac2e9623397c99679;hpb=5cf6851e385edfdec4955120e03bf7e282dc8a68

diff --git a/tests/meta.g b/tests/meta.g
index 2779b7c..4b4df1f 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 ws ^"/" e
+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"
            |    ^"()"
-           |    ^"{" alternatives "}"   /ws
+           |    ^"{" sequence "}"       /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws