From: adam <adam@megacz.com>
Date: Tue, 13 Dec 2005 03:33:54 +0000 (-0500)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~613
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=4e85e3e3519cf88a4469d4ead6369eaa1ab2c4e2;hp=548a4a1afc3c2f2a521f0b564925aa92adfbe557

checkpoint

darcs-hash:20051213033354-5007d-6ce0926fd6069810906cd3cb9971557cf9e09713.gz
---

diff --git a/tests/meta.g b/tests/meta.g
index 4c02201..8c3a343 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,26 +1,27 @@
 s         ::=  w* Grammar w*                  => "gram"
 Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Sequence
-            |  word ^"!::=" Sequence
+R         ::=  word  ^"::=" Alternatives
+            |  word ^"!::=" Alternatives
 
 ec        ::=  [~\]\\\-\~] | escaped
 
-Sequence  ::=  Class   +/ ">"
-Class     ::=  Rewrite +/ "|"                 => "alternatives"
+Alternatives  ::=  EquiAlt   +/ ">"
+EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 
-Rewrite   ::=  Rewritex
-            |  Rewritex ^"&"  E+
-            |  Rewritex ^"&~" E+
+Sequence    ::= E+
+Conjuncts   ::=  Rewrite
+              |  Rewrite ^"&"  Sequence
+              |  Rewrite ^"&~" Sequence
 
-Rewritex  ::=  E+                             => "rewrite"
-            |  E+ ^"=>" word
-            |  E+ ^"=>" quoted
-            |  E+  "=>" "()"                  => "wrap"
+Rewrite  ::=  Sequence                             => "rewrite"
+           |  Sequence ^"=>" word
+           |  Sequence ^"=>" quoted
+           |  Sequence  "=>" "()"                  => "wrap"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Sequence "}"
+           |    ^"{" Alternatives "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -39,7 +40,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Sequence ")"
+           >    ^"(" Alternatives ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"