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

diff --git a/tests/meta.g b/tests/meta.g
index 79e3159..b1fb352 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,32 +1,28 @@
-s         ::=  Grammar ws                  => "gram"
-w       !::= " "
-           | "\n"
-           | "\r"
-ws       !::=  w** | w** "//" (~[\n]*) "\n" ws
-wp       !::=  w++
-Grammar   ::=  r +/ ws                        => "grammar"
+s           ::=  Grammar ws                  => "gram"
+Grammar     ::=  NonTerminal +/ ws           => "grammar"
+NonTerminal ::=  word  ^"::=" RHS /ws
 
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
+w        ::= " " | "\n" | "\r"
+ws        ::=  w** => ()
+            |  w** "//" (~[\n]*) "\n" ws => ()
+wp        ::=  w++
 
-alternatives  ::=  (Conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
+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)? => "ps2"
+             | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
 psy        ::= ps
-             | ps wp ^"/" ws e
+             | ps !wp ^"/" !ws e
 psx        ::= psy                   => "psy"
-//             | e "<-" psy        /ws => "psyl"
-             |        psy "->" e /ws => "psyr"
-//             | e "<-" psy "->" e /ws => "psylr"
+             | psy ^"->" e /ws
 Sequence   ::= Quoted => "qprod"
              > psx => "psx"
              | psx  "=>" ^"[]"         /ws
-             | psx ^"=>" (word|Quoted) /ws
+             | psx ^"=>" ("()"|word|Quoted) /ws
 
 ec       ::= ~[\-\]\\]
            | escaped
@@ -40,15 +36,19 @@ e        ::=  word                          => "nonTerminal"
            |    ^"{" 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 -> ~[+]
+           |  e ^"++/" e                /ws        
+           |  e ^"+/"  e                /ws        
+           |  e ^"**"                   /ws -> ~[/]
+           |  e ^"*"                    /ws -> ~[*]
+           |  e ^"**/" e                /ws        
+           |  e ^"*/"  e                /ws        
            |  ^"!" e                    /ws
            |  e ^"?"                    /ws
 
            |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
+           >    ^"(" RHS  ")"           /ws
            |    ^"~" e
 
 word     ::= [a-zA-Z0-9_]++