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

diff --git a/tests/meta.g b/tests/meta.g
index 359319d..2dc0fb9 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,21 +1,27 @@
 s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+ws       !::=  w** | w** "//" (~[\n]*) "\n" ws
+wp       !::=  w++
 grammar   ::=  r +/ ws                        => "grammar"
+
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)
-
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
+alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-sequence    ::= e*/ws
-                (ws "/" e)?
-                (ws "=>" ws (word|quoted))?              => "seq"
+conjuncts     ::=  sequence
+                |  sequence ^"&"  e*/ws   /ws
+                |  sequence ^"&~" e*/ws   /ws
 
-rewrite  ::=  sequence
+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
@@ -23,27 +29,22 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
-           |  e ^"?"                    /ws
-
+e        ::=  word                          => "nonTerminal"
            |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /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
-
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 w       !::= " "
-           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 word     ::= [a-zA-Z0-9_]++