compiler seems to be working

diff --git a/CompInt.hs b/CompInt.hs
index d5aa2ca052ada77068d47afd86bb901eeb053a98..1934447c5e1110079dc94f93cf2867a9cfb52c47 100644 (file)
--- a/CompInt.hs
+++ b/CompInt.hs
@@ -48,6 +48,10 @@ main = do
        args <- getArgs
        case args of
                [] -> hGetContents stdin >>= run interpret pProgram
-               "-c":f:[] -> runFile (\fun st -> writeFile (f++".c") $ compile fun st)  pProgram f
+               "-c":f:[] -> let file = (f++".c") in do
+                       putStrLn $ "Compiling "++f++" to the C99-compatible file:"++file
+                       runFile (\fun st -> writeFile file $ compile fun st)  pProgram f
                f:[] -> runFile interpret pProgram f
-               _ -> print "Too many arguments"
+               _ -> do
+                       putStrLn "Usage: ./CompInt [-c] <file>"
+                       putStrLn "-c : compile <file> to C99-compatible file"

diff --git a/Compile.hs b/Compile.hs
index eb70d0c8223e9e71ec356cce274f850ad454239b..f2de7ecdac8228f805218815320e1e2fb5a3ab2f 100644 (file)
--- a/Compile.hs
+++ b/Compile.hs
@@ -3,12 +3,14 @@ module Compile (compile,compileExp, compileStm) where
 import Abssyntax
 import Prelude hiding (lookup)
 
-cHeader = "#include <stdio.h>\nint read(){\nint n;\nscanf(\"%d\",&n);\nreturn n;\n}\nint main(void){\n"
+cHeader = "#include <stdio.h>\nint read(){\nint n;\nscanf(\"%d\",&n);\nreturn n;\n}\n"
 
-cFooter = "return 0;}"
+cMiddle = "\nint main(void){\n"
+
+cFooter = "return 0;}\n"
 
 compile :: [Func] -> [Stm] -> String
-compile f s = cHeader++concat (map compileStm s)++cFooter
+compile f s = cHeader++concat (map compileFuncDecl f)++concat (map compileFunc f)++cMiddle++concat (map compileStm s)++cFooter
 
 compileExp :: Exp -> String
 compileExp (EBool True) = "1";
@@ -23,6 +25,7 @@ compileExp (EPost (Ident i) Plus) = i++"++"
 compileExp (EPost (Ident i) Minus) = i++"--"
 compileExp EReadI = "read()"
 compileExp EReadB = "read()"
+compileExp (EFunc (Ident i) as) = i++"("++(foldl1 (\a b -> a++","++b) (map compileExp as))++")"
 
 op :: Op -> String
 op Eq = "=="
@@ -48,3 +51,10 @@ compileStm (SDeclD t i) = compileStm (SDecl t i $ case t of
        TBool -> EBool False
        )
 compileStm (SDecl t (Ident i) e) = "int "++i++"="++compileExp e++";\n"
+compileStm (SReturn e) = "return "++compileExp e++";"
+
+compileFunc :: Func -> String
+compileFunc (Func _ (Ident i) d ss) = "\nint "++i++"("++(foldl1 (\a b -> a++","++b) (map (\(Decl _ (Ident i)) -> "int "++i) d))++"){\n"++concat (map compileStm ss)++"\n}\n"
+
+compileFuncDecl :: Func -> String
+compileFuncDecl (Func _ (Ident i) d ss) = "\nint "++i++"("++(foldl1 (\a b -> a++","++b) (map (\(Decl _ (Ident i)) -> "int "++i) d))++");\n"