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

diff --git a/tests/meta.g b/tests/meta.g
index beda61b..9755cfc 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,44 +1,55 @@
-s         ::=  w* Grammar w*                  => "gram"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Class+/">"
-            |  word ^"!::=" Class+/">"
+s         ::=  ws grammar ws                  => "gram"
+ws       !::=  w**
+grammar   ::=  r+/ws => "grammar"
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
 
 ec        ::=  [~\]\\\-\~] | escaped
 
-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"
 
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-E        ::= word                             => "nonTerminalY"
+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"
-           |    ^"{" Class+/">" "}"
+           |    ^"{" alternatives "}"   /ws
            |     "[" [\~]?  range* "]"        => "range"
-           |  E ^"*/" E
-           |  E ^"+/" E
-           |  E ^"?"
-           |  E ^"~/~"
+           |  e ^"*/" e                 /ws
+           |  e ^"%%" e                 /ws
+           |  e ^"+/" e                 /ws
+           |  e ^"?"                    /ws
+           |  e ^"~/~"                  /ws
 
-           |  E ^"-"  E
+           |  e ^"-"  e                 /ws
 
-           |    ^"!" E
-           |     "^" quoted => "care"
-           |    ^"`" E
-           |  E ^"#"
+           |    ^"!" e                  /ws
+           |     "^" quoted             /ws => "care"
+           |    ^"`" e                  /ws
+           |  e ^"#"                    /ws
            |  quoted                        => "literal"
 
-           |  (E ^"**" > E ^"*")
-           |  (E ^"++" > E ^"+")
+           |  (e ws ^"**" > e ws ^"*")
+           |  (e ws ^"++" > e ws ^"+")
 
-           |     "(" word ^")"
-           >    ^"(" Class+/">" ")"
+           |     "(" word ^")"          /ws
+           >    ^"(" alternatives ")"   /ws
 
 w       !::= " "
            | "//" [~\n]* "\n"
@@ -50,3 +61,5 @@ quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
+
+