X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Interpreter.hs;h=e41759db1c93d656391b6d0d53bf4c20193fb152;hb=08d98a82fabc381a8b101387f39ae5752cfeb314;hp=bccc53d0fdb4871b1469011ee041adf59b196cd8;hpb=2316d61f350f8b39c9a3f76b91d1d14796d5183b;p=proglang.git

diff --git a/Interpreter.hs b/Interpreter.hs
index bccc53d..e41759d 100644
--- a/Interpreter.hs
+++ b/Interpreter.hs
@@ -13,7 +13,8 @@ import Abssyntax
 
 import Typecheck
 import Interpret
-import Control.Monad.State
+import Control.Monad.State hiding (State)
+import Control.Concurrent.MVar
 import Data.Map as Map hiding (showTree)
 
 import ErrM
@@ -24,26 +25,32 @@ myLLexer = myLexer
 
 type Verbosity = Int
 
+splitFunStm :: [FuncStm] -> ([Func],[Stm])
+splitFunStm [] = ([],[])
+splitFunStm ((F f):fss) = let (fs,ss) = splitFunStm fss in (f:fs,ss)
+splitFunStm ((S s):fss) = let (fs,ss) = splitFunStm fss in (fs,s:ss)
+
 putStrV :: Verbosity -> String -> IO ()
 putStrV v s = if v > 1 then putStrLn s else return ()
 
-runFile :: Verbosity -> ParseFun Stms -> FilePath -> IO ()
+runFile :: Verbosity -> ParseFun Program -> FilePath -> IO ()
 runFile v p f = putStrLn f >> readFile f >>= run v p
 
-run :: Verbosity -> ParseFun Stms -> String -> IO ()
+run :: Verbosity -> ParseFun Program -> String -> IO ()
 run v p s = let ts = myLLexer s in case p ts of
 	Bad s    -> do
 		putStrLn "\nParse              Failed...\n"
 		putStrV v "Tokens:"
 		putStrV v $ show ts
 		putStrLn s
-	Ok (Program s) -> do
+	Ok (Program s) -> let (fun,st) = splitFunStm (s) in do
 		putStrLn "\nParse Successful!"
 		showTree v (Program s)
-		runStateT (mapM typeCheckStm s) [empty]
+		runStateT (do mapM Typecheck.addFunction fun; mapM typeCheckFunction fun; mapM typeCheckStm st) Typecheck.emptyState
 		print "The program is type-correct!!"
 		print "Running program:"
-		runStateT (mapM execute s) [empty]
+		mv <- newEmptyMVar
+		runStateT (do mapM Interpret.addFunction fun; mapM execute st) Interpret.emptyState{ret=mv}
 		print "Done running program!"
 		return ()
 
@@ -56,9 +63,9 @@ showTree v tree
 main :: IO ()
 main = do args <- getArgs
           case args of
-            [] -> hGetContents stdin >>= run 2 pStms
-            "-s":fs -> mapM_ (runFile 0 pStms) fs
-            fs -> mapM_ (runFile 2 pStms) fs
+            [] -> hGetContents stdin >>= run 2 pProgram
+            "-s":fs -> mapM_ (runFile 0 pProgram) fs
+            fs -> mapM_ (runFile 2 pProgram) fs