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

diff --git a/tests/meta.g b/tests/meta.g
index bb7cd11..c9d588d 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,13 +22,14 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
-           |    ^"{" alternatives "}"   /ws
+e        ::=  word                          => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
+//           |    ^"!" e                  /ws
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
@@ -35,10 +37,8 @@ e        ::= word                             => "nonTerminal"
            |  e ^"+/" e                 /ws
            |  e ^"?"                    /ws
 
-           |  quoted                        => "literal"
-
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 
 w       !::= " "
            | "//" ([~\n]*) "\n"