X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=074b9f3e7c67d939df3364fdf54fde7ae92c953e;hp=29663f7c4b2c91898c8372df2d7bf1dd5e942b27;hb=65a0e50a721e1c9ef6c5f38c29229e476733748b;hpb=c1325de42a4ddfad3ff9b10bfdda11078e38e8a6

diff --git a/tests/meta.g b/tests/meta.g
index 29663f7..074b9f3 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,5 +1,5 @@
 s         ::=  w* Grammar w*                  => "gram"
-ws       !::= w*
+ws       !::=  w*
 grammar   ::=  R+/ws => "grammar"
 Grammar   ::=  R+ => "grammar"
 R         ::=  word  ^"::=" Alternatives
@@ -10,17 +10,18 @@ ec        ::=  [~\]\\\-\~] | escaped
 Alternatives  ::=  EquiAlt   +/ ">"
 EquiAlt       ::=  Conjuncts +/ "|"                 => "alternatives"
 
-Sequence    ::= E+ ^"/" E
-              > E+
+sequence    ::= Es ^"/" E   /ws
+              > Es
+es ::= E+/ws
 
-Conjuncts   ::=  Rewrite
-              |  Rewrite ^"&"  Sequence
-              |  Rewrite ^"&~" Sequence
+Conjuncts   ::=  rewrite
+              |  rewrite ^"&"  sequence
+              |  rewrite ^"&~" sequence
 
-Rewrite  ::=  Sequence                             => "rewrite"
-           |  Sequence ^"=>" word
-           |  Sequence ^"=>" quoted
-           |  Sequence  "=>" "()"                  => "wrap"
+rewrite  ::=  sequence                  /ws        => "rewrite"
+           |  sequence ^"=>" word       /ws
+           |  sequence ^"=>" quoted     /ws
+           |  sequence  "=>" "()"       /ws        => "wrap"
 
 range    ::= ec => "range0" | ec ^"-" ec      => "range0"
 E        ::= word                             => "nonTerminalY"