X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=2dc0fb9fbf8ecf374dfd7f448cc612290b1ca30d;hp=8a5b7e17f3573d7272e103a720bd40ecaa84aa8e;hb=7783442fcff4e640ecdcbdb6149463048d32f7a7;hpb=ad0974ef59fc62ab06a78795a65e68238426edd0

diff --git a/tests/meta.g b/tests/meta.g
index 8a5b7e1..2dc0fb9 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,5 +1,5 @@
 s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+ws       !::=  w** | w** "//" (~[\n]*) "\n" ws
 wp       !::=  w++
 grammar   ::=  r +/ ws                        => "grammar"
 
@@ -12,12 +12,16 @@ conjuncts     ::=  sequence
                 |  sequence ^"&"  e*/ws   /ws
                 |  sequence ^"&~" e*/ws   /ws
 
-ps          ::= e*/ws                              => "ps"
-              | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
-psx         ::= ps
-              | ps wp ^"/" ws e
-sequence    ::= psx
-              | psx ^"=>" (word|quoted) /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
@@ -32,16 +36,15 @@ e        ::=  word                          => "nonTerminal"
            |    ^"["  range* "]"
            |    ^"[~" range* "]"
 
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
+           |  (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_]++