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

diff --git a/tests/meta.g b/tests/meta.g
index 5347aeb..138ec62 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,23 +1,22 @@
-s         ::=  ws Grammar ws                  => "gram"
+s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  R+/ws => "grammar"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Alternatives
-            |  word ^"!::=" Alternatives
+grammar   ::=  r+/ws => "grammar"
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
 
 ec        ::=  [~\]\\\-\~] | escaped
 
-Alternatives  ::=  EquiAlt   +/ ">"
-EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
+alternatives  ::=  equiAlt   +/ (ws ">" ws)
+equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
 
 sequence    ::= Es
               > Es ^"/" E   /ws
 Es          ::= E+
 //es          ::= E+/ws
 
-Conjuncts   ::=  rewrite
-              |  rewrite ^"&"  sequence
-              |  rewrite ^"&~" sequence
+conjuncts   ::=  rewrite
+              |  rewrite ^"&"  sequence   /ws
+              |  rewrite ^"&~" sequence   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
@@ -27,7 +26,7 @@ rewrite  ::=  sequence                  /ws        => "rewrite"
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Alternatives "}"
+           |    ^"{" alternatives "}"
            |     "[" [\~]?  range* "]"        => "range"
            |  E ^"*/" E
            |  E ^"+/" E
@@ -46,7 +45,7 @@ E        ::= word                             => "nonTerminalY"
            |  (E ^"++" > E ^"+")
 
            |     "(" word ^")"
-           >    ^"(" Alternatives ")"
+           >    ^"(" alternatives ")"
 
 w       !::= " "
            | "//" [~\n]* "\n"