X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=0f690221b0a37908bf4a5bab95da6670be7eb4bb;hp=6c4110227835da62ccf17e2bba2c41ed4e5e3b68;hb=c366dacc334fe2e35835164f5a37d3eebb2ca6d5;hpb=41f3013f707529437b829c8c0e6c447b550749e5

diff --git a/tests/meta.g b/tests/meta.g
index 6c41102..0f69022 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,66 +1,60 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws => "grammar"
+s         ::=  Grammar ws                  => "gram"
+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)          => "alternatives"
-
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
-
-ss ::= es | es ^"/" e /ws
-
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
-
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
-
-ec       ::= [~\-\]\\\~]
+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  "=>" ^"[]"         /ws
+             | psx ^"=>" (word|Quoted) /ws
+
+ec       ::= ~[\-\]\\]
            | escaped
 
-range    ::= ec          => "range"
+Range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |  e ^"+/" e                 /ws
-           |  e ^"*/" e                 /ws
-           |  e ^"?"                    /ws
-           |  e ^"~/~"                  /ws
-
-           |  e ^"-"  e                 /ws
+e        ::=  word                          => "nonTerminal"
+           |  Quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" Sequence "}"       /ws
+           |    ^"["  Range* "]"
 
-           |    ^"!" e                  /ws
-           |    "^" quoted             /ws => "care"
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-           |  quoted                        => "literal"
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  (e ws ^"++" > e ws ^"+")
+           |  (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
+           |    ^"~" e
 
 w       !::= " "
-           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++                           => "sify"
-quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
+word     ::= [a-zA-Z0-9_]++
+Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
+           | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]