checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 17bff83..a0585bd 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,11 +1,11 @@
 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
@@ -35,6 +35,8 @@ e        ::= word                             => "nonTerminalY"
            |     "[~" (range*) "]" => "rangex"
            |  e ^"%%" e                 /ws
            |  e ^"$$" e                 /ws
+           |  e ^"+/" e                 /ws
+           |  e ^"*/" e                 /ws
            |  e ^"?"                    /ws
            |  e ^"~/~"                  /ws