checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 7afdbc4..359319d 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,19 +7,15 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
 equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
-
-ss ::= es | es ^"/" e /ws
-
 conjuncts   ::=  rewrite
               |  rewrite ^"&"  e*/ws   /ws
               |  rewrite ^"&~" e*/ws   /ws
 
-rewrite  ::=  sequence                  /ws        => "rewrite"
-           |  sequence ^"=>" word       /ws
-           |  sequence ^"=>" quoted     /ws
+sequence    ::= e*/ws
+                (ws "/" e)?
+                (ws "=>" ws (word|quoted))?              => "seq"
+
+rewrite  ::=  sequence
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -33,12 +29,8 @@ e        ::= word                             => "nonTerminal"
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
            |    ^"^" quoted             /ws
-           |  e ^"~/~"                  /ws
            |    ^"!" e                  /ws
 
-           |    ^"`" e                  /ws
-           |  e ^"#"                    /ws
-
            |  (e ws ^"**" > e ws ^"*")
            |  e ^"*/" e                 /ws
            |  (e ws ^"++" > e ws ^"+")
@@ -54,8 +46,7 @@ w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
+word     ::= [a-zA-Z0-9_]++
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"