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

diff --git a/tests/meta.g b/tests/meta.g
index 3c191d4..1a97296 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,18 +1,16 @@
 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
@@ -24,14 +22,17 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" quoted     /ws
            |  sequence  "=>" "()"       /ws        => "wrap"
 
+ec       ::= [~\-\]\\\~]
+           | escaped
+
 range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range0"
+           | ec ^"-" ec  => "range1"
 
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "[" [\~]?  range* "]"        => "range"
-           |  e ^"+/" e                 /ws
+           |     "["  ranges "]"        => "range"
+           |     "[~" ranges "]"        => "rangex"
            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
            |  e ^"?"                    /ws
@@ -51,6 +52,8 @@ e        ::= word                             => "nonTerminalY"
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
 
+ranges ::= range*
+
 w       !::= " "
            | "//" [~\n]* "\n"
            | "\n"