X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=b1552f1bdf129fe3a32e46e0c23d62ff3c189c86;hp=3227dca94baf0b6eec65ca42c68e0f820a3411a2;hb=22a2ca7685dcf29e9ddcc6e26443ea0277385fca;hpb=665d5abdf0269ef5bd4cc4b93bb82b3f74bb0110

diff --git a/tests/meta.g b/tests/meta.g
index 3227dca..b1552f1 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,59 +1,67 @@
-s           ::=  !ws Grammar ws              => "gram"
-Grammar     ::=  NonTerminal +/ ws           => "grammar"
-NonTerminal ::=  word  ^"::=" RHS /ws
-
-RHS         ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
-
-Conjuncts   ::=  Sequence
-              |  Sequence ^"&"  Elements  /ws
-              |  Sequence ^"&~" Elements  /ws
-Elements    ::=  e*/ws
-
-psy         ::= Elements (!wp "/" !ws e)? => "ps2"
-psx         ::= psy                   => "psy"
-              | psy ^"->" e /ws
-Sequence    ::= Quoted => "qprod"
-              > psx => "psx"
-              | psx  "=>" ^"[]"              /ws
-              | psx ^"=>" ("()"|word|Quoted) /ws
-
-ec          ::= ~[\-\]\\]
+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           ::=  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 => caret
-
-              |     "(" 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++