X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=bb7cd114d94bf05ab028246df247490f0b38e86d;hp=a0585bdf4014b72757047e3370a4f22e4d7f7254;hb=8ad399319f15cd179fa05a5052314a8f1d7df271;hpb=8eaf1ed0aa03013b3547c183adfd9352f845073c

diff --git a/tests/meta.g b/tests/meta.g
index a0585bd..bb7cd11 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,55 +1,41 @@
 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"
+equiAlt       ::=  conjuncts +/ (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"
+sequence    ::= e*/ws
+                (ws "/" e)?
+                (ws "=>" ws (word|quoted))?              => "seq"
 
 ec       ::= [~\-\]\\\~]
            | escaped
 
-range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range1"
+range    ::= ec          => "range"
+           | ec ^"-" ec
 
-e        ::= word                             => "nonTerminalY"
-           |    [(][)] => "epsilon"
+e        ::= word                             => "nonTerminal"
+           |    [(][)]                        => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "["  (range*) "]" => "range"
-           |     "[~" (range*) "]" => "rangex"
-           |  e ^"%%" e                 /ws
-           |  e ^"$$" e                 /ws
-           |  e ^"+/" e                 /ws
-           |  e ^"*/" e                 /ws
-           |  e ^"?"                    /ws
-           |  e ^"~/~"                  /ws
-
-           |  e ^"-"  e                 /ws
-
+           |    ^"["  (range*) "]"
+           |    ^"[~" (range*) "]"
+           |    ^"^" 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
+
+           |  quoted                        => "literal"
 
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
@@ -58,9 +44,9 @@ 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]