X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=17f039903c16260fee556f23eac42f9c3f45dac6;hp=e6f27358557367dc817d41910a06a3ec873213b5;hb=4378d20232cd88fb2a57edc5a5114f952ab58a18;hpb=87bf9df44b553d0e5fb1465983b0dc9f90b699b0

diff --git a/tests/meta.g b/tests/meta.g
index e6f2735..17f0399 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,10 +4,18 @@
 
 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
+              |  Word  "*/" Word ws! ^"=" ws! RHS
        
 RHS           =  (Sequence +/ (ws! "|" ws!)) +/ (ws! ">" ws!)
 
@@ -26,7 +34,7 @@ ec            = ~[\-\]\\]
               | escaped
 
 Range         = ec
-              | ec ^"-" ec
+              | ec "-" ec
 
 e             =                (Quoted|Word) ^":" e
               >                NonTerminalReference
@@ -50,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 = "\"\""
@@ -60,6 +68,6 @@ escaped    = "\n":: "\\n"
            |        "\\" ~[nr]
 
 w             = " " | "\n" | "\r"
-ws            =  "()":: w**
-              |  "()":: w** "//" (~[\n])* "\n" ws
+ws            =  w**
+              |  w** "//" (~[\n])*! "\n" ws!
 wp            =  w++