@@ -79,7 +79,7 @@ keywords = [ "...", "as", "break", "case", "catch", "class", "const", "continue" "implements", "import", "in", "instanceof", "interface", "internal", "is", "native", "new", "null", "package", "private", "protected", "public", "return", "super", "switch", "this", "throw", - "to", "true", "try", "typeof", "use", "undefined", "var", "void", "while", "with", + "true", "try", "typeof", "use", "undefined", "var", "void", "while", "with", -- syntactic keywords "each", "get", "set", "namespace", "include", "dynamic", "final", "native", "override", "static" ActionhaXe/Lexer.hs @@ -64,6 +64,7 @@ inClassBlock = try(do{ lookAhead( op "}"); return [] }) <|> try(do{ x <- metadata; i <- inClassBlock; return $ [x] ++ i}) <|> try(do{ x <- methodDecl; i <- inClassBlock; return $ [x] ++ i}) <|> try(do{ x <- varS; i <- inClassBlock; return $ [x] ++ i}) + <|> try(do{ x <- block; i <- inClassBlock; return $ [x] ++ i }) -- there can be blocks in classes for static initializations <|> (do{ x <- anytok; i <- inClassBlock; return $ [(Tok x)] ++ i}) interfaceBlock = do{ l <- op "{"; enterScope; x <- inInterfaceBlock; r <- op "}"; exitScope; return $ Block l x r } ActionhaXe/Parser.hs @@ -171,6 +171,7 @@ classBlockItem b = MethodDecl _ _ _ _ _ _ -> methodDecl b >>= return VarS _ _ _ _ -> memberVarS b >>= return Metadata m -> metadata m >>= return + Block _ _ _ -> block b >>= return _ -> return $ show b return x ActionhaXe/Translator.hs 7862b6b769d73f35d236d5935b55dca94b2c65b6 Don-Duong Quach geekrelief@gmail.com http://github.com/geekrelief/as3tohaxe/commit/811ab67c24cd69d929405e7fd87c4b5f85c8d455 811ab67c24cd69d929405e7fd87c4b5f85c8d455 2009-02-10T23:42:41-08:00 2009-02-10T23:42:41-08:00 allow anonymous blocks in class w/o conversion, removed 'to' as keyword 8dabd7b0427c96c947bdbbcf4c41dea8a2c84296 Don-Duong Quach geekrelief@gmail.com