X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=98a62a3ab47f95a36667b0629e9aba23cd2cb6ec;hp=f9e0e67830ed7d37a41b24b27e42e8006c946a49;hb=21740a3a499b34210969ad5f06a1b1dbd80145f3;hpb=93ea8e84f6eadb1b2549754bbb832c75e4730e86

diff --git a/tests/meta.g b/tests/meta.g
index f9e0e67..98a62a3 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,22 +1,30 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+s         ::=  grammar ws                  => "gram"
+ws       !::=  w** | w** "//" (~[\n]*) "\n" ws
+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 ^"/" e /ws
-sequence    ::= psx
-              | psx ^"=>" (word|quoted) /ws
-
-ec       ::= [~\-\]\\\~]
+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                   => "psy"
+             | e "<-" psy        /ws => "psyl"
+             |        psy "->" e /ws => "psyr"
+             | e "<-" psy "->" e /ws => "psylr"
+sequence   ::= quoted => "qprod"
+             > psx
+             | psx ^"=>" (word|quoted) /ws
+
+ec       ::= ~[\-\]\\]
            | escaped
 
 range    ::= ec          => "range"
@@ -26,29 +34,26 @@ 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* "]"
+
+           |  (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
+           |    ^"~" e
 
 w       !::= " "
-           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]