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

diff --git a/tests/meta.g b/tests/meta.g
index 092cb9e..21597fd 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,22 +1,21 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
-grammar   ::=  r $$ ws => "grammar"
+grammar   ::=  r +/ ws => "grammar"
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  equiAlt   $$ (ws ">" ws)
-equiAlt       ::=  conjuncts $$ (ws "|" ws)          => "alternatives"
+alternatives  ::=  equiAlt   +/ (ws ">" ws)
+equiAlt       ::=  conjuncts +/ (ws "|" ws)          => "alternatives"
 
 sequence    ::= es
-              > Es ws ^"/" e
-Es          ::= e %% (w**)
-es          ::= e %% (w**)
+              > es ws ^"/" e
+es          ::= e */ (w**)
 
 ss ::= es | es ^"/" e /ws
 
 conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e%%ws   /ws
-              |  rewrite ^"&~" e%%ws   /ws
+              |  rewrite ^"&"  e*/ws   /ws
+              |  rewrite ^"&~" e*/ws   /ws
 
 rewrite  ::=  sequence                  /ws        => "rewrite"
            |  sequence ^"=>" word       /ws
@@ -34,8 +33,8 @@ e        ::= word                             => "nonTerminalY"
            |    ^"{" alternatives "}"   /ws
            |     "["  (range*) "]" => "range"
            |     "[~" (range*) "]" => "rangex"
-           |  e ^"%%" e                 /ws
-           |  e ^"$$" e                 /ws
+           |  e ^"+/" e                 /ws
+           |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws