X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Fmeta.g;h=7dff3eb8801cc44f963383d2d3a7199d085f1ce2;hb=028c0419378758379cef3b058f5b0cb9ff9639fc;hp=64f18f928cbfeff94633f38e1245cd963acafacd;hpb=574d2f85990e11f0a45e9028fbadf08aaedfd93a;p=sbp.git

diff --git a/tests/meta.g b/tests/meta.g
index 64f18f9..7dff3eb 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,53 +1,57 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  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"
-              | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
-psx         ::= ps
-              > ps ^"/" e /ws
-sequence    ::= psx
-              | psx ^"=>" (word|quoted) /ws
-
-ec       ::= [~\-\]\\\~]
+s           ::=  Grammar ws                  => "gram"
+Grammar     ::=  NonTerminal +/ ws           => "grammar"
+NonTerminal ::=  word  ^"::=" RHS /ws
+
+w        ::= " " | "\n" | "\r"
+ws        ::=  w** => ()
+            |  w** "//" (~[\n]*) "\n" ws => ()
+wp        ::=  w++
+
+RHS        ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts  ::=  Sequence
+             |  Sequence ^"&"  e*/ws   /ws
+             |  Sequence ^"&~" e*/ws   /ws
+
+ps         ::= e*/ws                              => "ps"
+             | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
+psy        ::= ps
+             | ps !wp ^"/" !ws e
+psx        ::= psy                   => "psy"
+             | psy ^"->" e /ws
+Sequence   ::= Quoted => "qprod"
+             > psx => "psx"
+             | psx  "=>" ^"[]"         /ws
+             | psx ^"=>" ("()"|word|Quoted) /ws
+
+ec       ::= ~[\-\]\\]
            | escaped
 
-range    ::= ec          => "range"
+Range    ::= ec          => "range"
            | ec ^"-" ec
 
 e        ::=  word                          => "nonTerminal"
-           |  quoted                        => "literal"
+           |  Quoted                        => "literal"
            |    ^"()"
-           |    ^"{" sequence "}"       /ws
-           |    ^"["  range* "]"
-           |    ^"[~" range* "]"
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
+           |    ^"{" Sequence "}"       /ws
+           |    ^"["  Range* "]"
+
+           |  (e ^"++"    /ws > e ^"+"    /ws)
+           |  (e ^"++/" e /ws > e ^"+/" e /ws)
+           |  (e ^"**"    /ws > e ^"*"    /ws)
+           |  (e ^"**/" e /ws > e ^"*/" e /ws)
+           |  ^"!" e                    /ws
            |  e ^"?"                    /ws
 
            |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
+           >    ^"(" RHS  ")"           /ws
+           |    ^"~" e
+
 word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]