checkpoint

[sbp.git] / tests / meta.g

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