X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=64f18f928cbfeff94633f38e1245cd963acafacd;hp=5723e6d1522bb71a9ef3f25357e705fdc201bd88;hb=50ff66e926f981a5b3716f218ad24603c2a12e3f;hpb=107df9a4aee6ba593b64d3bbe8b2efac84596cad

diff --git a/tests/meta.g b/tests/meta.g
index 5723e6d..64f18f9 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,18 +1,22 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
 grammar   ::=  r +/ ws                        => "grammar"
+
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
 alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-conjuncts   ::=  sequence
-              |  sequence ^"&"  e*/ws   /ws
-              |  sequence ^"&~" e*/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
@@ -24,10 +28,8 @@ e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
            |    ^"()"
            |    ^"{" sequence "}"       /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
+           |    ^"["  range* "]"
+           |    ^"[~" range* "]"
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
@@ -37,7 +39,6 @@ e        ::=  word                          => "nonTerminal"
 
            |     "(" word         ^")"  /ws
            >    ^"(" alternatives  ")"  /ws
-
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"