update metagrammar

[sbp.git] / tests / meta.g

diff --git a/tests/meta.g b/tests/meta.g
index 43f539a..b1552f1 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,59 +1,67 @@
-s             =  !ws Grammar ws              => "gram"
-Grammar       =  NonTerminal +/ ws           => "grammar"
-NonTerminal   =  word  !wp ^"=" !wp RHS
-        
-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"
+s             = ws Grammar ws
+
+Grammar::     = Declaration +/ ws
+
+Declaration   = NonTerminal
+              | ^"#import" FileName            /ws
+              | ^"#import" FileName "as" Word  /ws
+
+FileName::    = (~[\r\n ] | escaped)+ -> [\r\n ]
+
+NonTerminal   = NonTerminal:: Word            ws  "=" ws RHS
+              | DropNT::      Word  "!"       ws  "=" ws RHS
+              | Colons::      Word  "::"      ws  "=" ws RHS
+              |               Word  "*"       ws ^"=" ws RHS
+              |               Word  "*/" Word ws ^"=" ws RHS
+       
+RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws)
+
+Elements::    = e*/ws
+
+PreSequence   = Elements
+              | (Quoted|Word)   ^"::" PreSequence /ws
+              > PreSequence     ^"/"      e       /ws
+              | PreSequence     ^"->"     e       /ws
+
+Sequence      = PreSequence
+              | Sequence ^"&"  Elements /ws
+              | Sequence ^"&~" Elements /ws
+
+e             =                                   e ^"!"
+              >                (Quoted|Word) ^":" e
+              >                NonTerminalReference:: Word
+              |                Literal:: Quoted
+              |                  ^"()"
+              |                  ^"{" PreSequence "}"    /ws
+              |                  ^"["  Range* "]"
+              |                e ^"++"                   /ws -> ~[/]
+              |                e ^"+"                    /ws -> ~[+]
+              |                e ^"++/" e                /ws        
+              |                e ^"+/"  e                /ws        
+              |                e ^"**"                   /ws -> ~[/]
+              |                e ^"*"                    /ws -> ~[*]
+              |                e ^"**/" e                /ws        
+              |                e ^"*/"  e                /ws        
+              |                e ^"?"                    /ws
+              |                  ^"^"   Quoted
+              |                   "(" Word  ^")"
+              >                  ^"(" RHS  ")"           /ws
+              |                  ^"~" e
+              |                  ^"\\{"
+              |                  ^"\\}"
+
+Word::        = [.a-zA-Z0-9_]++
+Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
+              | "\"\""
+
+Range::       = ec
+              | ec "-" ec
 
 ec            = ~[\-\]\\]
               | escaped
+escaped       = "\n"::  "\\n"
+              | "\r"::  "\\r"
+              |         "\\" ~[nr]
+
+ws!           = [ \r\n]** ("//" ~[\n]* "\n" ws)?
 
-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)+) "\""
-           | "\"\"" => ""
-escaped    = "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" ~[nr]
-
-
-w             = " " | "\n" | "\r"
-ws            =  w** => ()
-              |  w** "//" ~[\n]* "\n" ws => ()
-wp            =  w++