X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=092cb9ebc5d426f9af5a80d9a5066836091def3f;hp=d20233e5f00a528cbf8e4ca4ed6186a6a6663e73;hb=6470b3188790f3461508a9f290d70c344c6fedf2;hpb=f4baa31bac9c31b6fbc8e8a5d220e480dff36e78

diff --git a/tests/meta.g b/tests/meta.g
index d20233e..092cb9e 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,15 +7,16 @@ r         ::=  word  ^"::=" alternatives /ws
 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**)
+es          ::= e %% (w**)
 
+ss ::= es | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
-              |  rewrite ^"&"  es   /ws
-              |  rewrite ^"&~" es   /ws
+              |  rewrite ^"&"  e%%ws   /ws
+              |  rewrite ^"&~" e%%ws   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
@@ -31,8 +32,8 @@ range    ::= ec          => "range0"
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "["  ranges "]"        => "range"
-           |     "[~" ranges "]"        => "rangex"
+           |     "["  (range*) "]" => "range"
+           |     "[~" (range*) "]" => "rangex"
            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
            |  e ^"?"                    /ws
@@ -52,15 +53,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]