checkpoint harmony

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 11fee67..0f69022 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,40 +1,41 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
+s         ::=  Grammar ws                  => "gram"
+ws       !::=  w** | w** "//" (~[\n]*) "\n" ws
 wp       !::=  w++
-grammar   ::=  r +/ ws                        => "grammar"
+Grammar   ::=  r +/ ws                        => "grammar"
 
 r         ::=  word  ^"::=" alternatives /ws
             |  word ^"!::=" alternatives /ws
 
-alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
+alternatives  ::=  (Conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
 
-conjuncts     ::=  sequence
-                |  sequence ^"&"  e*/ws   /ws
-                |  sequence ^"&~" e*/ws   /ws
+Conjuncts     ::=  Sequence
+                |  Sequence ^"&"  e*/ws   /ws
+                |  Sequence ^"&~" e*/ws   /ws
 
 ps         ::= e*/ws                              => "ps"
-             | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+             | (e+/ws ws)? "^" Quoted (ws e+/ws)? => "ps2"
 psy        ::= ps
              | ps wp ^"/" ws e
-psx        ::= psy ^"?=>" e /ws
-             | psy ^"!=>" e /ws
-             > psy
-sequence   ::= quoted => "qprod"
+psx        ::= psy                   => "psy"
+             | e "<-" psy        /ws => "psyl"
+             |        psy "->" e /ws => "psyr"
+             | e "<-" psy "->" e /ws => "psylr"
+Sequence   ::= Quoted => "qprod"
              > psx
-             | psx ^"=>" (word|quoted) /ws
+             | psx  "=>" ^"[]"         /ws
+             | psx ^"=>" (word|Quoted) /ws
 
-ec       ::= [~\-\]\\\~]
+ec       ::= ~[\-\]\\]
            | escaped
 
-range    ::= ec          => "range"
+Range    ::= ec          => "range"
            | ec ^"-" ec
 
 e        ::=  word                          => "nonTerminal"
-           |  quoted                        => "literal"
+           |  Quoted                        => "literal"
            |    ^"()"
-           |    ^"{" sequence "}"       /ws
-           |    ^"["  range* "]"
-           |    ^"[~" range* "]"
+           |    ^"{" Sequence "}"       /ws
+           |    ^"["  Range* "]"
 
            |  (e ^"++"    /ws > e ^"+"    /ws)
            |  (e ^"++/" e /ws > e ^"+/" e /ws)
@@ -44,15 +45,16 @@ e        ::=  word                          => "nonTerminal"
 
            |     "(" word         ^")"  /ws
            >    ^"(" alternatives  ")"  /ws
+           |    ^"~" e
+
 w       !::= " "
-           | "//" ([~\n]*) "\n"
            | "\n"
            | "\r"
 word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
+Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
            | "\"\"" => ""
 escaped  ::= "\\n" => "\n"
            | "\\r" => "\r"
-           | "\\" [~nr]
+           | "\\" ~[nr]