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

diff --git a/tests/meta.g b/tests/meta.g
index 11cb9f8..61a6437 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -7,9 +7,8 @@ s             =  ws! Grammar ws!
 Grammar       =  Declaration +/ ws
 
 Declaration   =  NonTerminal
-              |  ^"#import" ws! FileName //(ws! "as" ws! Prefix)?
+              |  ^"#import" ws! FileName (ws! "as" ws! Word)?
 
-//Prefix        = ([a-zA-Z] ".")+ "*"
 FileName      = FileNameChar+ -> [\r\n ]
 FileNameChar  = Space:: "\\ "
               | ~[\r\n ]
@@ -35,7 +34,7 @@ ec            = ~[\-\]\\]
               | escaped
 
 Range         = ec
-              | ec ^"-" ec
+              | ec "-" ec
 
 e             =                (Quoted|Word) ^":" e
               >                NonTerminalReference
@@ -56,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 = "\"\""
@@ -69,6 +70,6 @@ escaped    = "\n":: "\\n"
            |        "\\" ~[nr]
 
 w             = " " | "\n" | "\r"
-ws            =  "()":: w**
-              |  "()":: w** "//" (~[\n])* "\n" ws
+ws            =  w**
+              |  w** "//" (~[\n])*! "\n" ws!
 wp            =  w++