X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=638fa71a19a21366e750b497ea9c13703e460d62;hp=eba7a6d82b25c908e9e50c0795bb2cd6e15ee24f;hb=1d5f76f8144b739719737bfe75f321caf67cfa19;hpb=61446887e40e11e0a7374e591e6d6c25c922093f

diff --git a/tests/meta.g b/tests/meta.g
index eba7a6d..638fa71 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,32 +1,40 @@
-s             =  gram::    !ws Grammar ws
-Grammar       =  grammar:: NonTerminal +/ ws
-NonTerminal   =            word  !wp ^"=" !wp RHS
-        
-RHS           =  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
-
-Conjuncts     =  Sequence
-              |  Sequence ^"&"  Elements  /ws
-              |  Sequence ^"&~" Elements  /ws
-Elements      =  e*/ws
-
-PreSequence   = ps::  Elements
-              |       PreSequence !wp ^"/"  !ws e
-              |       PreSequence     ^"->"     e /ws
-              |       (Quoted|word)   ^"::" PreSequence /ws
-              |       PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
-Sequence      = psx:: PreSequence
+//funkanomitron
+s             = ws Grammar ws
 
-ec            = ~[\-\]\\]
-              | escaped
+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
 
-Range         = range:: ec
-              |         ec ^"-" ec
+PreSequence   = Elements
+              | (Quoted|Word)   ^"::" PreSequence /ws
+              > PreSequence     ^"/"      e       /ws
+              | PreSequence     ^"->"     e       /ws
 
-e             =                (Quoted|word) ^":" e
-              > nonTerminal::          word
-              | literal::       Quoted
+Sequence      = PreSequence
+              | Sequence ^"&"  Elements /ws
+              | ^"~~"  Elements /ws
+              | Sequence ^"&~" Elements /ws
+
+e             =                                   e ^"!"
+              >                (Quoted|Word) ^":" e
+              >                NonTerminalReference:: Word
+              |                Literal:: Quoted
               |                  ^"()"
-              |                  ^"{" Sequence "}"       /ws
+              |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
               |                e ^"++"                   /ws -> ~[/]
               |                e ^"+"                    /ws -> ~[+]
@@ -36,23 +44,28 @@ e             =                (Quoted|word) ^":" e
               |                e ^"*"                    /ws -> ~[*]
               |                e ^"**/" e                /ws        
               |                e ^"*/"  e                /ws        
-              |                  ^"!"   e                /ws
               |                e ^"?"                    /ws
-              |                  ^"^" Quoted             /ws
-
-              |                   "(" word         ^")"  /ws
+              |                  ^"^"   Quoted
+              |                  ^"`"   e
+              |                  ^"..."
+              |                   "(" Word  ^")"
               >                  ^"(" RHS  ")"           /ws
-              |                  ^"~" e
+              |                 "~":: ("~" -> ~"~")!  e
+              |                  ^"\\{"
+              |                  ^"\\}"
+
+Word::        = [.a-zA-Z0-9_]++ &~ "."+
+Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
+              | "\"\""
 
-word       = [a-zA-Z0-9_]++
-Quoted     = "\"" ((~[\"\\] | escaped)+) "\""
-           | ""::   "\"\""
-escaped    = "\n":: "\\n"
-           | "\r":: "\\r"
-           |        "\\" ~[nr]
+Range::       = ec
+              | ec "-" ec
 
+ec            = ~[\-\]\\]
+              | escaped
+escaped       = "\n"::  "\\n"
+              | "\r"::  "\\r"
+              |         "\\" ~[nr]
 
-w             = " " | "\n" | "\r"
-ws            =  w** => ()
-              |  w** "//" ~[\n]* "\n" ws => ()
-wp            =  w++
+ws!          = [ \r\n]**
+             | [ \r\n]** "//" ~[\n]* "\n" ws