checkpoint

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index b1fb352..807f15f 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,55 +1,49 @@
-s           ::=  Grammar ws                  => "gram"
+s           ::=  !ws 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"
-           | ec ^"-" ec
-
-e        ::=  word                          => "nonTerminal"
-           |  Quoted                        => "literal"
-           |    ^"()"
-           |    ^"{" 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
-           >    ^"(" RHS  ")"           /ws
-           |    ^"~" e
+RHS         ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts   ::=  Sequence
+              |  Sequence ^"&"  Elements  /ws
+              |  Sequence ^"&~" Elements  /ws
+Elements    ::=  e*/ws
+
+PreSequence ::= Elements => "ps"
+              | PreSequence !wp ^"/"  !ws e
+              | PreSequence     ^"->"     e /ws
+              | (Quoted|word)   ^"::" PreSequence /ws
+              | PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence    ::= PreSequence    => "psx"
+
+ec          ::= ~[\-\]\\]
+              | escaped
+
+Range       ::= ec          => "range"
+              | ec ^"-" ec
+
+e           ::=
+                (Quoted|word) ^":" e
+              >  word                          => "nonTerminal"
+              |  Quoted                        => "literal"
+              |    ^"()"
+              |    ^"{" 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
+              |    ^"^" Quoted             /ws
+
+              |     "(" word         ^")"  /ws
+              >    ^"(" RHS  ")"           /ws
+              |    ^"~" e
 
 word     ::= [a-zA-Z0-9_]++
 Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
@@ -59,3 +53,7 @@ escaped  ::= "\\n" => "\n"
            | "\\" ~[nr]
 
 
+w           ::= " " | "\n" | "\r"
+ws          ::=  w** => ()
+              |  w** "//" ~[\n]* "\n" ws => ()
+wp          ::=  w++