checkpoint

darcs-hash:20051213032947-5007d-0040704d953afb49f61f6467d0d9b7aa30a6196b.gz

diff --git a/tests/meta.g b/tests/meta.g
index 1dccbd6..beda61b 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,7 +1,7 @@
 s         ::=  w* Grammar w*                  => "gram"
 Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Class+/gt
-            |  word ^"!::=" Class+/gt
+R         ::=  word  ^"::=" Class+/">"
+            |  word ^"!::=" Class+/">"
 
 ec        ::=  [~\]\\\-\~] | escaped
 
@@ -17,11 +17,9 @@ Rewritex  ::=  E+                             => "rewrite"
             |  E+  "=>" "()"                  => "wrap"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-gt   !::= ">"
-bar  !::= "|"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Class+/gt "}"
+           |    ^"{" Class+/">" "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -40,7 +38,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Class+/gt ")"
+           >    ^"(" Class+/">" ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"

diff --git a/tests/regression.tc b/tests/regression.tc
index 040bf84..2aba4b1 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -155,7 +155,7 @@ testcase {
     output "poo:{poo:{poox poox} poox}";
     output "poo:{poox poo:{poox poox}}";
     s ::= s s "a"  => "poo"
-    s ::= ()       => "poox"
+        | ()       => "poox"
 }
 
 testcase {