merged changes to function branch

[proglang.git] / Interpreter.hs

diff --git a/Interpreter.hs b/Interpreter.hs
index e41759db1c93d656391b6d0d53bf4c20193fb152..ae73abba4a1cff690a8bab18e84c977298c73809 100644 (file)
--- a/Interpreter.hs
+++ b/Interpreter.hs
@@ -13,9 +13,6 @@ import Abssyntax
 
 import Typecheck
 import Interpret
-import Control.Monad.State hiding (State)
-import Control.Concurrent.MVar
-import Data.Map as Map hiding (showTree)
 
 import ErrM
 
@@ -46,13 +43,11 @@ run v p s = let ts = myLLexer s in case p ts of
        Ok (Program s) -> let (fun,st) = splitFunStm (s) in do
                putStrLn "\nParse Successful!"
                showTree v (Program s)
-               runStateT (do mapM Typecheck.addFunction fun; mapM typeCheckFunction fun; mapM typeCheckStm st) Typecheck.emptyState
+               typeCheck fun st
                print "The program is type-correct!!"
                print "Running program:"
-               mv <- newEmptyMVar
-               runStateT (do mapM Interpret.addFunction fun; mapM execute st) Interpret.emptyState{ret=mv}
+               interpret fun st
                print "Done running program!"
-               return ()
 
 showTree :: (Show a, Print a) => Int -> a -> IO ()
 showTree v tree