X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=ac726191e1e925f285d80f41630fdbe512d3ba2d;hp=4b4df1fef16a16bc450ef07ff99a1ef4e406c438;hb=ea7e036150d05484ee7867e73d80b5789972edbc;hpb=6f995008673ec682df49866ac2e9623397c99679

diff --git a/tests/meta.g b/tests/meta.g
index 4b4df1f..ac72619 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,54 +1,68 @@
-s         ::=  ws grammar ws                  => "gram"
-ws       !::=  w**
-grammar   ::=  r +/ ws                        => "grammar"
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
-
-alternatives  ::=  (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
-
-conjuncts   ::=  sequence
-              |  sequence ^"&"  e*/ws   /ws
-              |  sequence ^"&~" e*/ws   /ws
-
-ps          ::= e*/ws => "ps"
-psx         ::= ps
-              > ps ws ^"/" e
-sequence    ::= psx
-              | psx ^"=>" (word|quoted) /ws
-
-ec       ::= [~\-\]\\\~]
-           | escaped
-
-range    ::= ec          => "range"
-           | ec ^"-" ec
-
-e        ::=  word                          => "nonTerminal"
-           |  quoted                        => "literal"
-           |    ^"()"
-           |    ^"{" sequence "}"       /ws
-           |    ^"["  (range*) "]"
-           |    ^"[~" (range*) "]"
-           |    ^"^" quoted             /ws
-           |    ^"!" e                  /ws
-
-           |  (e ws ^"**" > e ws ^"*")
-           |  e ^"*/" e                 /ws
-           |  (e ws ^"++" > e ws ^"+")
-           |  e ^"+/" e                 /ws
-           |  e ^"?"                    /ws
-
-           |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
-
-w       !::= " "
-           | "//" ([~\n]*) "\n"
-           | "\n"
-           | "\r"
-word     ::= [a-zA-Z0-9_]++
-quoted   ::= "\"" (([~\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" [~nr]
+ //funkanomitron
+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]**
+             | [ \r\n]** "//" ~[\n]* "\n" ws