X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=1a972961acbb80c4e556ee5a178a49c1e2c832c4;hp=55bc02af5668533b149de1ee805deae3a024a560;hb=77d1e5fd29be1ca529e71a4c011f5edea61588e8;hpb=b194da7e8cc5bd13e03d59008c34deefc4e15764

diff --git a/tests/meta.g b/tests/meta.g
index 55bc02a..1a97296 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,18 +1,17 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  r+/ws => "grammar"
+grammar   ::=  r $$ ws => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-ec        ::=  [~\]\\\-\~] | escaped
-
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
+alternatives  ::=  equiAlt   $$ (ws ">" ws)
+equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
 sequence    ::= Es
               > Es ^"/" e  /ws
 Es          ::= e+
-//es          ::= E+/ws
+es          ::= e %% ws
+
 
 conjuncts   ::=  rewrite
               |  rewrite ^"&"  sequence   /ws
@@ -23,13 +22,19 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" quoted     /ws
            |  sequence  "=>" "()"       /ws        => "wrap"
 
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
+ec       ::= [~\-\]\\\~]
+           | escaped
+
+range    ::= ec          => "range0"
+           | ec ^"-" ec  => "range1"
+
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "[" [\~]?  range* "]"        => "range"
-           |  e ^"*/" e                 /ws
-           |  e ^"+/" e                 /ws
+           |     "["  ranges "]"        => "range"
+           |     "[~" ranges "]"        => "rangex"
+           |  e ^"%%" e                 /ws
+           |  e ^"$$" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws
 
@@ -47,6 +52,8 @@ e        ::= word                             => "nonTerminalY"
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
 
+ranges ::= range*
+
 w       !::= " "
            | "//" [~\n]* "\n"
            | "\n"
@@ -57,3 +64,5 @@ quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
+
+