X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmeta.g;h=5103b5b652301fedb6b77c8a2b28b1fa8fde3014;hb=8e641de44000b55b2451bdaee56b4e31f077b25b;hp=9755cfc18f8adb23deb5f63a1bf7d3beb07a0ec6;hpb=2fae767715346f7d7e708b63f00a2f40ec26d3de;p=sbp.git

diff --git a/tests/meta.g b/tests/meta.g
index 9755cfc..5103b5b 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,39 +1,42 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  r+/ws => "grammar"
+grammar   ::=  r $$ ws => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-ec        ::=  [~\]\\\-\~] | escaped
+alternatives  ::=  equiAlt   $$ (ws ">" ws)
+equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
 
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
-
-sequence    ::= Es
-              > Es ^"/" e  /ws
-Es          ::= e+
-//es          ::= e+/ws
+sequence    ::= es
+              > es ws ^"/" e
+es          ::= e %% (w**)
 
+ss ::= es | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
-              |  rewrite ^"&"  sequence   /ws
-              |  rewrite ^"&~" sequence   /ws
+              |  rewrite ^"&"  e%%ws   /ws
+              |  rewrite ^"&~" e%%ws   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
            |  sequence ^"=>" quoted     /ws
            |  sequence  "=>" "()"       /ws        => "wrap"
 
+ec       ::= [~\-\]\\\~]
+           | escaped
+
 range    ::= ec          => "range0"
-           | ec ^"-" ec  => "range0"
+           | ec ^"-" ec  => "range1"
 
 e        ::= word                             => "nonTerminalY"
            |    [(][)] => "epsilon"
            |    ^"{" alternatives "}"   /ws
-           |     "[" [\~]?  range* "]"        => "range"
-           |  e ^"*/" e                 /ws
+           |     "["  (range*) "]" => "range"
+           |     "[~" (range*) "]" => "rangex"
            |  e ^"%%" e                 /ws
+           |  e ^"$$" e                 /ws
            |  e ^"+/" e                 /ws
+           |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws
 
@@ -52,12 +55,12 @@ e        ::= word                             => "nonTerminalY"
            >    ^"(" 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]