X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=f709a77bddf1564ba243bb56a6f4a23d185cef8e;hp=5b69051e48a7395bfbe750b5fcb2aef584ea6b60;hb=be24ec463cd9a9a4f907c5a6167d8029726753ea;hpb=560874f4dff528e676d6686d6ece366d4e4c6141

diff --git a/tests/meta.g b/tests/meta.g
index 5b69051..f709a77 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,22 +1,21 @@
 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  ::=  equiAlt   +/ (ws ">" ws)
+equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
 
-sequence    ::= Es
-              > Es ^"/" e  /ws
-Es          ::= e+
-es          ::= e %% ws
+sequence    ::= es
+              > es ws ^"/" e
+es          ::= e */ (w**)
 
 ss ::= es | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e%%ws   /ws
-              |  rewrite ^"&~" e%%ws   /ws
+              |  rewrite ^"&"  e*/ws   /ws
+              |  rewrite ^"&~" e*/ws   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
@@ -26,16 +25,16 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
 ec       ::= [~\-\]\\\~]
            | escaped
 
-range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range1"
+range    ::= ec          => "range"
+           | ec ^"-" ec
 
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "["  ranges "]"        => "range"
-           |     "[~" ranges "]"        => "rangex"
-           |  e ^"%%" e                 /ws
-           |  e ^"$$" e                 /ws
+           |     "["  (range*) "]" => "ranges"
+           |     "[~" (range*) "]" => "rangesx"
+           |  e ^"+/" e                 /ws
+           |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws
 
@@ -53,15 +52,13 @@ e        ::= word                             => "nonTerminalY"
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
 
-ranges ::= range*
-
 w       !::= " "
-           | "//" [~\n]* "\n"
+           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 an       ::= [a-zA-Z0-9_]
 word     ::= an++                           => "sify"
-quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
+quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]