X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=138ec62a9c7ef708b6ea747c502a94c241e95500;hp=4c02201f885069539b024d8ad789a290e8297391;hb=f491592fb43d4fd68221db2b893baaede4cfdaca;hpb=548a4a1afc3c2f2a521f0b564925aa92adfbe557

diff --git a/tests/meta.g b/tests/meta.g
index 4c02201..138ec62 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,26 +1,32 @@
-s         ::=  w* Grammar w*                  => "gram"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Sequence
-            |  word ^"!::=" Sequence
+s         ::=  ws grammar ws                  => "gram"
+ws       !::=  w**
+grammar   ::=  r+/ws => "grammar"
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
 
 ec        ::=  [~\]\\\-\~] | escaped
 
-Sequence  ::=  Class   +/ ">"
-Class     ::=  Rewrite +/ "|"                 => "alternatives"
+alternatives  ::=  equiAlt   +/ (ws ">" ws)
+equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "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   /ws
+              |  rewrite ^"&~" sequence   /ws
+
+rewrite  ::=  sequence                  /ws        => "rewrite"
+           |  sequence ^"=>" word       /ws
+           |  sequence ^"=>" quoted     /ws
+           |  sequence  "=>" "()"       /ws        => "wrap"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Sequence "}"
+           |    ^"{" alternatives "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -39,7 +45,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Sequence ")"
+           >    ^"(" alternatives ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"