checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 8a8b25a..5103b5b 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,10 +7,9 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   $$ (ws ">" ws)
 equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
-sequence    ::= Es
-              > Es ws ^"/" e
-Es          ::= e %% (w**)
-es          ::= e %% ws
+sequence    ::= es
+              > es ws ^"/" e
+es          ::= e %% (w**)
 
 ss ::= es | es ^"/" e /ws
 
@@ -32,10 +31,12 @@ range    ::= ec          => "range0"
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "["  ranges "]"        => "range"
-           |     "[~" ranges "]"        => "rangex"
+           |     "["  (range*) "]" => "range"
+           |     "[~" (range*) "]" => "rangex"
            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
+           |  e ^"+/" e                 /ws
+           |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws
 
@@ -53,15 +54,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]