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

diff --git a/tests/meta.g b/tests/meta.g
index abe03f3..ac72619 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,44 +1,37 @@
-// use 'a'-'z' or 'a-z' instead of [a-z]?
-// EOF token?
-// #include (with renaming?)
+ //funkanomitron
+s             = ws Grammar ws
 
-s             =  ws! Grammar ws!
+Grammar::     = Declaration +/ ws
 
-Grammar       =  Declaration +/ ws
+Declaration   = NonTerminal
+              | ^"#import" FileName            /ws
+              | ^"#import" FileName "as" Word  /ws
 
-Declaration   =  NonTerminal
-              |  ^"#import" ws! FileName (ws! "as" ws! Word)?
+FileName::    = (~[\r\n ] | escaped)+ -> [\r\n ]
 
-FileName      = FileNameChar+ -> [\r\n ]
-FileNameChar  = Space:: "\\ "
-              | ~[\r\n ]
-
-NonTerminal   =  Word           "="     RHS /ws
-              |  Word  "*" ws! ^"=" ws! RHS
-              |  Word  "*/" Word ws! ^"=" ws! RHS
+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
+RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws)
 
-Sequence      = psx:: PreSequence
-              |       Sequence ^"&"  Elements /ws
-              |       Sequence ^"&~" Elements /ws
+Elements::    = e*/ws
 
-ec            = ~[\-\]\\]
-              | escaped
+PreSequence   = Elements
+              | (Quoted|Word)   ^"::" PreSequence /ws
+              > PreSequence     ^"/"      e       /ws
+              | PreSequence     ^"->"     e       /ws
 
-Range         = ec
-              | ec "-" ec
+Sequence      = PreSequence
+              | Sequence ^"&"  Elements /ws
+              | Sequence ^"&~" Elements /ws
 
-e             =                (Quoted|Word) ^":" e
-              >                NonTerminalReference
-              |                Literal
+e             =                                   e ^"!"
+              >                (Quoted|Word) ^":" e
+              >                NonTerminalReference:: Word
+              |                Literal:: Quoted
               |                  ^"()"
               |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
@@ -50,26 +43,26 @@ e             =                (Quoted|Word) ^":" e
               |                e ^"*"                    /ws -> ~[*]
               |                e ^"**/" e                /ws        
               |                e ^"*/"  e                /ws        
-              |                     e ^"!"
               |                e ^"?"                    /ws
               |                  ^"^"   Quoted
+              |                   "(" Word  ^")"
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e
               |                  ^"\\{"
               |                  ^"\\}"
 
-NonTerminalReference = Word
-Literal              = Quoted
-Word                 = [.a-zA-Z0-9_]++
-Quoted               = "\"" ((~[\"\\] | escaped)+) "\""
-                     | EmptyString
-                       EmptyString = "\"\""
+Word::        = [.a-zA-Z0-9_]++
+Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
+              | "\"\""
+
+Range::       = ec
+              | ec "-" ec
 
-escaped    = "\n":: "\\n"
-           | "\r":: "\\r"
-           |        "\\" ~[nr]
+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