X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=tests%2Fmeta.g;h=61a643707f49cbc54339b49ae10949c512785d2e;hb=0a543da83c6f21d79b6682415327b52abca38362;hp=02464c31e2e0261a606b409b6fd0b2e158cf88b8;hpb=df76fcb56242a90011500ab89092d2108350a8ab;p=sbp.git

diff --git a/tests/meta.g b/tests/meta.g
index 02464c3..61a6437 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,7 +4,14 @@
 
 s             =  ws! Grammar ws!
 
-Grammar       =  NonTerminal +/ ws
+Grammar       =  Declaration +/ ws
+
+Declaration   =  NonTerminal
+              |  ^"#import" ws! FileName (ws! "as" ws! Word)?
+
+FileName      = FileNameChar+ -> [\r\n ]
+FileNameChar  = Space:: "\\ "
+              | ~[\r\n ]
 
 NonTerminal   =  Word           "="     RHS /ws
               |  Word  "*" ws! ^"=" ws! RHS
@@ -27,7 +34,7 @@ ec            = ~[\-\]\\]
               | escaped
 
 Range         = ec
-              | ec ^"-" ec
+              | ec "-" ec
 
 e             =                (Quoted|Word) ^":" e
               >                NonTerminalReference
@@ -48,10 +55,12 @@ e             =                (Quoted|Word) ^":" e
               |                  ^"^"   Quoted
               >                  ^"(" RHS  ")"           /ws
               |                  ^"~" e
+              |                  ^"{"
+              |                  ^"}"
 
 NonTerminalReference = Word
 Literal              = Quoted
-Word                 = [a-zA-Z0-9_]++
+Word                 = [.a-zA-Z0-9_]++
 Quoted               = "\"" ((~[\"\\] | escaped)+) "\""
                      | EmptyString
                        EmptyString = "\"\""
@@ -61,6 +70,6 @@ escaped    = "\n":: "\\n"
            |        "\\" ~[nr]
 
 w             = " " | "\n" | "\r"
-ws            =  "()":: w**
-              |  "()":: w** "//" (~[\n])* "\n" ws
+ws            =  w**
+              |  w** "//" (~[\n])*! "\n" ws!
 wp            =  w++