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

diff --git a/tests/meta.g b/tests/meta.g
index 5723e6d..0ba0548 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -10,9 +10,12 @@ 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 +27,8 @@ e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
            |    ^"()"
            |    ^"{" sequence "}"       /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
+           |    ^"["  range* "]"
+           |    ^"[~" range* "]"
 
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws