checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index fa2b98f..2779b7c 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,18 +7,13 @@ r         ::=  word  ^"::=" alternatives /ws
 alternatives  ::=  equiAlt   +/ (ws ">" ws)
 equiAlt       ::=  conjuncts +/ (ws "|" ws)
 
-sequence    ::= es
-              > es ws ^"/" e
-es          ::= e */ (w**)
+conjuncts   ::=  sequence
+              |  sequence ^"&"  e*/ws   /ws
+              |  sequence ^"&~" e*/ws   /ws
 
-ss ::= es => "seq" | es ^"/" e /ws
-
-conjuncts   ::=  rewrite
-              |  rewrite ^"&"  e*/ws   /ws
-              |  rewrite ^"&~" e*/ws   /ws
-
-rewrite  ::=  sequence                     /ws        => "rewrite"
-           |  sequence ^"=>" (word|quoted) /ws
+sequence    ::= e*/ws
+                (ws "/" e)?
+                (ws "=>" ws (word|quoted))?              => "seq"
 
 ec       ::= [~\-\]\\\~]
            | escaped
@@ -26,8 +21,9 @@ ec       ::= [~\-\]\\\~]
 range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                             => "nonTerminal"
-           |    [(][)]                        => "epsilon"
+e        ::= word                           => "nonTerminal"
+           |  quoted                        => "literal"
+           |    ^"()"
            |    ^"{" alternatives "}"   /ws
            |    ^"["  (range*) "]"
            |    ^"[~" (range*) "]"
@@ -40,17 +36,14 @@ e        ::= word                             => "nonTerminal"
            |  e ^"+/" e                 /ws
            |  e ^"?"                    /ws
 
-           |  quoted                        => "literal"
-
-           |     "(" word ^")"          /ws
-           >    ^"(" alternatives ")"   /ws
+           |     "(" word         ^")"  /ws
+           >    ^"(" alternatives  ")"  /ws
 
 w       !::= " "
            | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
-an       ::= [a-zA-Z0-9_]
-word     ::= an++
+word     ::= [a-zA-Z0-9_]++
 quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"