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

diff --git a/tests/meta.g b/tests/meta.g
index beda61b..5347aeb 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,25 +1,33 @@
-s         ::=  w* Grammar w*                  => "gram"
+s         ::=  ws Grammar ws                  => "gram"
+ws       !::=  w**
+grammar   ::=  R+/ws => "grammar"
 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    ::= Es
+              > Es ^"/" E   /ws
+Es          ::= E+
+//es          ::= E+/ws
 
-Rewritex  ::=  E+                             => "rewrite"
-            |  E+ ^"=>" word
-            |  E+ ^"=>" quoted
-            |  E+  "=>" "()"                  => "wrap"
+Conjuncts   ::=  rewrite
+              |  rewrite ^"&"  sequence
+              |  rewrite ^"&~" sequence
+
+rewrite  ::=  sequence                  /ws        => "rewrite"
+           |  sequence ^"=>" word       /ws
+           |  sequence ^"=>" quoted     /ws
+           |  sequence  "=>" "()"       /ws        => "wrap"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Class+/">" "}"
+           |    ^"{" Alternatives "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -38,7 +46,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Class+/">" ")"
+           >    ^"(" Alternatives ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"