X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=807f15f080c93a0453c3a452db883844f3ec69ae;hp=79e315975a057be7343d3f5e040643f514456541;hb=5964a1161340a16d7dea471372737f2474576ceb;hpb=a0c19e9b49c4d4e662586da3075979bd59abad6b

diff --git a/tests/meta.g b/tests/meta.g
index 79e3159..807f15f 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,55 +1,49 @@
-s         ::=  Grammar ws                  => "gram"
-w       !::= " "
-           | "\n"
-           | "\r"
-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"
-             | (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"
-             | psx  "=>" ^"[]"         /ws
-             | psx ^"=>" (word|Quoted) /ws
-
-ec       ::= ~[\-\]\\]
-           | escaped
-
-Range    ::= ec          => "range"
-           | ec ^"-" ec
-
-e        ::=  word                          => "nonTerminal"
-           |  Quoted                        => "literal"
-           |    ^"()"
-           |    ^"{" 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
-           |    ^"~" e
+s           ::=  !ws Grammar ws              => "gram"
+Grammar     ::=  NonTerminal +/ ws           => "grammar"
+NonTerminal ::=  word  ^"::=" RHS /ws
+
+RHS         ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts   ::=  Sequence
+              |  Sequence ^"&"  Elements  /ws
+              |  Sequence ^"&~" Elements  /ws
+Elements    ::=  e*/ws
+
+PreSequence ::= Elements => "ps"
+              | PreSequence !wp ^"/"  !ws e
+              | PreSequence     ^"->"     e /ws
+              | (Quoted|word)   ^"::" PreSequence /ws
+              | PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence    ::= PreSequence    => "psx"
+
+ec          ::= ~[\-\]\\]
+              | escaped
+
+Range       ::= ec          => "range"
+              | ec ^"-" ec
+
+e           ::=
+                (Quoted|word) ^":" e
+              >  word                          => "nonTerminal"
+              |  Quoted                        => "literal"
+              |    ^"()"
+              |    ^"{" 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
+              |    ^"^" Quoted             /ws
+
+              |     "(" word         ^")"  /ws
+              >    ^"(" RHS  ")"           /ws
+              |    ^"~" e
 
 word     ::= [a-zA-Z0-9_]++
 Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
@@ -59,3 +53,7 @@ escaped  ::= "\\n" => "\n"
            | "\\" ~[nr]
 
 
+w           ::= " " | "\n" | "\r"
+ws          ::=  w** => ()
+              |  w** "//" ~[\n]* "\n" ws => ()
+wp          ::=  w++