X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=1a972961acbb80c4e556ee5a178a49c1e2c832c4;hp=4cc100b451f154a7aa895bbf37ce6e7a180e0910;hb=77d1e5fd29be1ca529e71a4c011f5edea61588e8;hpb=803319e1a90376c44262ae784b43453c763e7b7d

diff --git a/tests/meta.g b/tests/meta.g
index 4cc100b..1a97296 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,52 +1,58 @@
 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
+              > 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
            |  sequence ^"=>" quoted     /ws
            |  sequence  "=>" "()"       /ws        => "wrap"
 
-range    ::= ec => "range0" | ec ^"-" ec      => "range0"
-E        ::= word                             => "nonTerminalY"
+ec       ::= [~\-\]\\\~]
+           | escaped
+
+range    ::= ec          => "range0"
+           | ec ^"-" ec  => "range1"
+
+e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
-           |    ^"{" Alternatives "}"
-           |     "[" [\~]?  range* "]"        => "range"
-           |  E ^"*/" E
-           |  E ^"+/" E
-           |  E ^"?"
-           |  E ^"~/~"
-
-           |  E ^"-"  E
-
-           |    ^"!" E
-           |     "^" quoted => "care"
-           |    ^"`" E
-           |  E ^"#"
+           |    ^"{" alternatives "}"   /ws
+           |     "["  ranges "]"        => "range"
+           |     "[~" ranges "]"        => "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 ^")"          /ws
+           >    ^"(" alternatives ")"   /ws
 
-           |     "(" word ^")"
-           >    ^"(" Alternatives ")"
+ranges ::= range*
 
 w       !::= " "
            | "//" [~\n]* "\n"
@@ -58,3 +64,5 @@ quoted   ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
            | "\\" [~nr]
+
+