X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=ceb82ac93ccf2438fe680b177b662a0e37c88827;hp=beda61b07978b082fffb17a3fa3c0d06a427b4ac;hb=2a43edc3783a51c0ada2269835d833fa4ce8ab33;hpb=1981ad8a9fea8bf4d0940b649c211741b17dd1ff

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