checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 2779b7c..0ba0548 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,16 +4,18 @@ 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"
+              | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+psx         ::= ps
+              > ps ^"/" e /ws
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -21,14 +23,12 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                           => "nonTerminal"
+e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
            |    ^"()"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
+           |    ^"{" sequence "}"       /ws
+           |    ^"["  range* "]"
+           |    ^"[~" range* "]"
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws