X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=092cb9ebc5d426f9af5a80d9a5066836091def3f;hp=1dccbd60d29a352a2ec5bd60a8855135619b787d;hb=6470b3188790f3461508a9f290d70c344c6fedf2;hpb=ea5d0a5e3dffb5ba0143179fd28608c2de8046e0

diff --git a/tests/meta.g b/tests/meta.g
index 1dccbd6..092cb9e 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,54 +1,67 @@
-s         ::=  w* Grammar w*                  => "gram"
-Grammar   ::=  R+ => "grammar"
-R         ::=  word  ^"::=" Class+/gt
-            |  word ^"!::=" Class+/gt
+s         ::=  ws grammar ws                  => "gram"
+ws       !::=  w**
+grammar   ::=  r $$ ws => "grammar"
+r         ::=  word  ^"::=" alternatives /ws
+            |  word ^"!::=" alternatives /ws
 
-ec        ::=  [~\]\\\-\~] | escaped
+alternatives  ::=  equiAlt   $$ (ws ">" ws)
+equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
-Class     ::=  Rewrite +/ "|"                 => "alternatives"
+sequence    ::= es
+              > Es ws ^"/" e
+Es          ::= e %% (w**)
+es          ::= e %% (w**)
 
-Rewrite   ::=  Rewritex
-            |  Rewritex ^"&"  E+
-            |  Rewritex ^"&~" E+
+ss ::= es | es ^"/" e /ws
 
-Rewritex  ::=  E+                             => "rewrite"
-            |  E+ ^"=>" word
-            |  E+ ^"=>" quoted
-            |  E+  "=>" "()"                  => "wrap"
+conjuncts   ::=  rewrite
+              |  rewrite ^"&"  e%%ws   /ws
+              |  rewrite ^"&~" e%%ws   /ws
 
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-gt   !::= ">"
-bar  !::= "|"
-E        ::= word                             => "nonTerminalY"
+rewrite  ::=  sequence                  /ws        => "rewrite"
+           |  sequence ^"=>" word       /ws
+           |  sequence ^"=>" quoted     /ws
+           |  sequence  "=>" "()"       /ws        => "wrap"
+
+ec       ::= [~\-\]\\\~]
+           | escaped
+
+range    ::= ec          => "range0"
+           | ec ^"-" ec  => "range1"
+
+e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Class+/gt "}"
-           |     "[" [\~]?  range* "]"        => "range"
-           |  E ^"*/" E
-           |  E ^"+/" E
-           |  E ^"?"
-           |  E ^"~/~"
-
-           |  E ^"-"  E
-
-           |    ^"!" E
-           |     "^" quoted => "care"
-           |    ^"`" E
-           |  E ^"#"
+           |    ^"{" alternatives "}"   /ws
+           |     "["  (range*) "]" => "range"
+           |     "[~" (range*) "]" => "rangex"
+           |  e ^"%%" e                 /ws
+           |  e ^"$$" e                 /ws
+           |  e ^"?"                    /ws
+           |  e ^"~/~"                  /ws
+
+           |  e ^"-"  e                 /ws
+
+           |    ^"!" 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+/gt ")"
+           |     "(" word ^")"          /ws
+           >    ^"(" alternatives ")"   /ws
 
 w       !::= " "
-           | "//" [~\n]* "\n"
+           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 an       ::= [a-zA-Z0-9_]
 word     ::= an++                           => "sify"
-quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
+quoted   ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
+
+