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

diff --git a/tests/meta.g b/tests/meta.g
index 6c41102..f9e0e67 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,26 +1,20 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  r +/ ws => "grammar"
+grammar   ::=  r +/ ws                        => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
+alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
+conjuncts   ::=  sequence
+              |  sequence ^"&"  e*/ws   /ws
+              |  sequence ^"&~" e*/ws   /ws
 
-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"
+ps          ::= e*/ws => "ps"
+psx         ::= ps
+              > ps ^"/" e /ws
+sequence    ::= psx
+              | psx ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -28,37 +22,31 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
-           |    ^"{" alternatives "}"   /ws
+e        ::=  word                          => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
+           |    ^"{" sequence "}"       /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
-           |  e ^"+/" e                 /ws
-           |  e ^"*/" e                 /ws
-           |  e ^"?"                    /ws
-           |  e ^"~/~"                  /ws
-
-           |  e ^"-"  e                 /ws
-
+           |    ^"^" quoted             /ws
            |    ^"!" e                  /ws
-           |    "^" quoted             /ws => "care"
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-           |  quoted                        => "literal"
 
            |  (e ws ^"**" > e ws ^"*")
+           |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")
+           |  e ^"+/" e                 /ws
+           |  e ^"?"                    /ws
 
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 
 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]