checkpoint

darcs-hash:20051214022844-5007d-07101de8046b13ad1b65ee8e61657873ee9ba473.gz

diff --git a/tests/meta.g b/tests/meta.g
index e73ca6c..092cb9e 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,7 +7,7 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   $$ (ws ">" ws)
 equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
 alternatives  ::=  equiAlt   $$ (ws ">" ws)
 equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 

-sequence    ::= Es
+sequence    ::= es

               > Es ws ^"/" e
 Es          ::= e %% (w**)
 es          ::= e %% (w**)
               > Es ws ^"/" e
 Es          ::= e %% (w**)
 es          ::= e %% (w**)

@@ -32,8 +32,8 @@ range    ::= ec          => "range0"
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws

-           |     "["  ranges "]"        => "range"
-           |     "[~" ranges "]"        => "rangex"
+           |     "["  (range*) "]" => "range"
+           |     "[~" (range*) "]" => "rangex"

            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
            |  e ^"?"                    /ws

@@ -53,15 +53,13 @@ e        ::= word                             => "nonTerminalY"
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
 
            |     "(" word ^")"          /ws
            >    ^"(" alternatives ")"   /ws
 

-ranges ::= range*
-

 w       !::= " "
 w       !::= " "

-           | "//" [~\n]* "\n"
+           | "//" ([~\n]*) "\n"

            | "\n"
            | "\r"
 an       ::= [a-zA-Z0-9_]
 word     ::= an++                           => "sify"
            | "\n"
            | "\r"
 an       ::= [a-zA-Z0-9_]
 word     ::= an++                           => "sify"

-quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
+quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"

 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]

diff --git a/tests/regression.tc b/tests/regression.tc
index fbc8a4a..c807a7a 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -267,7 +267,7 @@ testcase {
 
 indent  !::= ww
 outdent !::= " "  outdent " "
 
 indent  !::= ww
 outdent !::= " "  outdent " "

-           | " "  [~]*    "\n"
+           | " "  ([~]*)  "\n"

 
 any      !::= [~]*
 s         ::= !any "\n\n" !ww statement !ww "\n\n" !any => smt
 
 any      !::= [~]*
 s         ::= !any "\n\n" !ww statement !ww "\n\n" !any => smt