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

diff --git a/tests/meta.g b/tests/meta.g
index 02464c3..216d3bf 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
@@ -51,7 +58,7 @@ e             =                (Quoted|Word) ^":" e
 
 NonTerminalReference = Word
 Literal              = Quoted
-Word                 = [a-zA-Z0-9_]++
+Word                 = [.a-zA-Z0-9_]++
 Quoted               = "\"" ((~[\"\\] | escaped)+) "\""
                      | EmptyString
                        EmptyString = "\"\""