build definitions/AS3_definitions.rar @@ -257,13 +257,12 @@ getProperty name = do x <- getState let a = accessors x let def = (AsTypeUnknown, False, False) - if (Map.notMember name a) - then do{ let a' = Map.insert name def a - ; let x' = x{ accessors = a' } - ; setState x' - ; return def - } - else Map.lookup name a >>= return + case Map.lookup name a of + Nothing -> do let a' = Map.insert name def a + let x' = x{ accessors = a' } + setState x' + return def + Just prop -> return prop setProperty name prop = do x <- getState ActionhaXe/Data.hs @@ -52,10 +52,14 @@ deleteFlag flag = do st <- get getFlag :: String -> StateT AsState IO String getFlag flag = do st <- get - if Map.member flag $ flags st + case Map.lookup flag $ flags st of + Just mval -> return mval + Nothing -> return "" +{- if Map.member flag $ flags st then do mval <- Map.lookup flag $ flags st return mval else return "" +-} insertInitMember output = do st <- get put st{initMembers = (output:(initMembers st))} @@ -110,15 +114,15 @@ classBlock (Block l bs r) = do ) "" al bi <- foldlM (\s b -> do{ x <- classBlockItem b; return $ s ++ x} ) "" bs nc <- checkConstructor l - return $ showd l ++ nc ++ props ++ showw l ++ bi ++ showb r + return $ showd l ++ showw l ++ nc ++ props ++ showw l ++ bi ++ showb r checkConstructor l = do con <- getFlag hasConstructor x <- getMembers - if con == "" && length x > 0 - then do let (nl, i) = getNI l + if con == "" + then do let (nl, i) = getNlIndent l initM <- getInitMembers l - return $ "public function new() {" ++ initM ++ "}"++ nl ++ i ++ showw l + return $ "public function new() { " ++ initM ++ "}"++ nl ++ i else return "" interfaceBlock (Block l bs r) = do @@ -136,14 +140,14 @@ constructorBlock (Block l bs r) = do initM <- getInitMembers l return $ showb l ++ initM ++ bi ++ showb r -getNI l = +getNlIndent l = let spacebreak = break (\c -> c == '\n') ( reverse $ showw l) i = reverse $ fst spacebreak nl = if length (snd spacebreak) > 1 && (snd spacebreak)!!1 == '\r' then "\r\n" else "\n" in (nl, i) getInitMembers l = - do let (nl, i) = getNI l + do let (nl, i) = getNlIndent l x <- getMembers if length x > 0 then return $ nl++i++ intercalate (nl++i) x ++ nl ++ i @@ -238,15 +242,14 @@ methodDecl (MethodDecl a f ac n s b) = do then do{ updateFlag hasConstructor "true"; x <- maybe (return "") constructorBlock b; s' <- signatureArgs s; return $ namespace a ++ showb f ++ "new"++showw n ++ s' ++ x } else do st <- get let accMap = accessors st - if Map.member (showd n) accMap - then do (t, _, _) <- Map.lookup (showd n) accMap - let arg = getArg s - x <- maybe (return "" ) (accblock arg ac) b - acc' <- accessor ac n s t - return $ namespace a ++ showb f ++ acc' ++ x - else do x <- maybe (return "") block b - s' <- signature s - return $ namespace a ++ showb f ++ showb n ++ s' ++ x + case Map.lookup (showd n) accMap of + Just (t, _, _) -> do let arg = getArg s + x <- maybe (return "" ) (accblock arg ac) b + acc' <- accessor ac n s t + return $ namespace a ++ showb f ++ acc' ++ x + Nothing -> do x <- maybe (return "") block b + s' <- signature s + return $ namespace a ++ showb f ++ showb n ++ s' ++ x where accessor ac name s@(Signature l args r ret) t = case ac of Just x -> do{ a <- showArgs args ActionhaXe/Translator.hs @@ -26,6 +26,7 @@ Requirements - parsec 3 http://hackage.haskell.org/cgi-bin/hackage-scripts/package/parsec Compile with: ghc --make -XDeriveDataTypeable as3tohaxe.hs +or the './build' script -- License -- This program and its source is GPL licensed. Please read the LICENSE README cdd84e2ff6dcd8269bf98db8a078e84199a724c1 Don-Duong Quach geekrelief@gmail.com http://github.com/geekrelief/as3tohaxe/commit/b1a406d615ce82a14301f1e6b26755ef8ffee9f7 b1a406d615ce82a14301f1e6b26755ef8ffee9f7 2009-01-17T12:02:34-08:00 2009-01-17T12:02:34-08:00 fixed errors from ghc update and added definitions for symtable lookup 68cd1558277c33c7b09ae669ca773e75fd0c2f25 Don-Duong Quach geekrelief@gmail.com