X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=8be950d3eba351373e4c573f237fe796dc764f1d;hp=a994e8dd36158e3b97a49da7e3d9acd8558ad25f;hb=56319e11eb20cb67c4221b0d7a2567ec3b2df002;hpb=9ca5aa82948f06917a81983c677e0f8b9cc86af3

diff --git a/tests/meta.g b/tests/meta.g
index a994e8d..8be950d 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,20 +1,27 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
+wp       !::=  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
-
-ps          ::= (e*/ ws) => "ps"
-psx         ::= ps
-              | ps ws ^"/" e
-sequence    ::= psx
-                (ws "=>" ws (word|quoted))?              => "seqx"
+conjuncts     ::=  sequence
+                |  sequence ^"&"  e*/ws   /ws
+                |  sequence ^"&~" e*/ws   /ws
+
+ps         ::= e*/ws                              => "ps"
+             | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+psy        ::= ps
+             | ps wp ^"/" ws e
+psx        ::= psy ^"?=>" e /ws
+             | psy ^"!=>" e /ws
+             > psy
+sequence   ::= quoted => "qprod"
+             > psx
+             | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -26,25 +33,22 @@ e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
            |    ^"()"
            |    ^"{" sequence "}"       /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
+           |    ^"["  range* "]"
+           |    ^"[~" range* "]"
+
+           |  (e ^"++"    /ws > e ^"+"    /ws)
+           |  (e ^"++/" e /ws > e ^"+/" e /ws)
+           |  (e ^"**"    /ws > e ^"*"    /ws)
+           |  (e ^"**/" e /ws > e ^"*/" e /ws)
            |  e ^"?"                    /ws
 
            |     "(" word         ^")"  /ws
            >    ^"(" alternatives  ")"  /ws
-
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-word     ::= [a-zA-Z0-9_]++
+word     ::= [a-zA-Z0-9_]+ !=> [a-zA-Z0-9_]
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"