X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=4fed049ea82deab6695b3f89ba885b88c346ac00;hp=e4a2518c2555cc660787b619d9c7174183bf2582;hb=ba01065d943324012ce347b80044dcf825f21845;hpb=d79a5062fbe0211d0ad3459d6a545a5270f6efbd

diff --git a/tests/meta.g b/tests/meta.g
index e4a2518..4fed049 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -5,22 +5,16 @@ 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
+equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
 conjuncts   ::=  rewrite
               |  rewrite ^"&"  e*/ws   /ws
               |  rewrite ^"&~" e*/ws   /ws
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
-           |  sequence  "=>" "()"       /ws        => "wrap"
+sequence    ::= e*/ws (ws "/" e)? => "seq"
+
+rewrite  ::=  sequence                     /ws => "rewrite"
+           |  sequence ^"=>" (word|quoted) /ws
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -28,18 +22,14 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminalY"
+e        ::= word                             => "nonTerminal"
            |    [(][)]                        => "epsilon"
            |    ^"{" alternatives "}"   /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
-           |  e ^"~/~"                  /ws
            |    ^"!" e                  /ws
 
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")
@@ -57,7 +47,8 @@ w       !::= " "
            | "\r"
 an       ::= [a-zA-Z0-9_]
 word     ::= an++
-quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
+quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+           | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]