checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 2779b7c..349be33 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,53 +1,61 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws                        => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
-
-alternatives  ::=  equiAlt   +/ (ws ">" ws)
-equiAlt       ::=  conjuncts +/ (ws "|" ws)
-
-conjuncts   ::=  sequence
-              |  sequence ^"&"  e*/ws   /ws
-              |  sequence ^"&~" e*/ws   /ws
-
-sequence    ::= e*/ws
-                (ws "/" e)?
-                (ws "=>" ws (word|quoted))?              => "seq"
-
-ec       ::= [~\-\]\\\~]
+s           ::=  Grammar ws                  => "gram"
+Grammar     ::=  NonTerminal +/ ws           => "grammar"
+NonTerminal ::=  word  ^"::=" RHS /ws
+
+w        ::= " " | "\n" | "\r"
+ws        ::=  w** => ()
+            |  w** "//" ~[\n]* "\n" ws => ()
+wp        ::=  w++
+
+RHS        ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts  ::=  Sequence
+             |  Sequence ^"&"  e*/ws   /ws
+             |  Sequence ^"&~" e*/ws   /ws
+
+ps         ::= e*/ws                              => "ps"
+             | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
+psy        ::= ps
+             | ps !wp ^"/" !ws e
+psx        ::= psy                   => "psy"
+             | psy ^"->" e /ws
+Sequence   ::= Quoted => "qprod"
+             > psx => "psx"
+             | psx  "=>" ^"[]"         /ws
+             | psx ^"=>" ("()"|word|Quoted) /ws
+
+ec       ::= ~[\-\]\\]
            | escaped
 
-range    ::= ec          => "range"
+Range    ::= ec          => "range"
            | ec ^"-" ec
 
-e        ::= word                           => "nonTerminal"
-           |  quoted                        => "literal"
+e        ::=  word                          => "nonTerminal"
+           |  Quoted                        => "literal"
            |    ^"()"
-           |    ^"{" alternatives "}"   /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
+           |    ^"{" Sequence "}"       /ws
+           |    ^"["  Range* "]"
+
+           |  e ^"++"                   /ws -> ~[/]
+           |  e ^"+"                    /ws -> ~[+]
+           |  e ^"++/" e                /ws        
+           |  e ^"+/"  e                /ws        
+           |  e ^"**"                   /ws -> ~[/]
+           |  e ^"*"                    /ws -> ~[*]
+           |  e ^"**/" e                /ws        
+           |  e ^"*/"  e                /ws        
+           |  ^"!" e                    /ws
            |  e ^"?"                    /ws
 
            |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
+           >    ^"(" RHS  ")"           /ws
+           |    ^"~" e
 
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
 word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]