X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Interpret.hs;h=0728d5181c967cf6d109f3327f2d8905e6738b1e;hb=9625a8a7eb7aebeb161ca15cf66cff5699f89103;hp=8cf3c1b2657270d016c8f28256b993adbd566c96;hpb=3e277a6a62728085cd8ba735b50bdac0b6d68808;p=proglang.git

diff --git a/Interpret.hs b/Interpret.hs
index 8cf3c1b..0728d51 100644
--- a/Interpret.hs
+++ b/Interpret.hs
@@ -1,4 +1,4 @@
-module Interpret (eval, execute, Value(VInt, VBool)) where
+module Interpret (interpret, eval, execute, Value(VInt, VBool)) where
 
 import Abssyntax
 import Control.Monad.State
@@ -14,9 +14,8 @@ instance Show Value where
 
 type Variables = [Map Ident Value]
 
-inList :: Eq a => a -> [a] -> Bool
-inList _ [] = False
-inList a (x:xs) = if a == x then True else inList a xs
+interpret :: [Stm] -> IO ()
+interpret s = runStateT (mapM execute s) [empty] >> return ()
 
 --eval :: (MonadState Variables m) => Exp -> m Value
 eval :: Exp -> StateT Variables IO Value
@@ -27,7 +26,7 @@ eval (EAss i e) = setVariableValue i e
 eval (BiOpExp e o e') = do
 	v <- eval e
 	v'<- eval e'
-	if inList o [Eq,NEq] then return $ opE o v v'
+	if elem o [Eq,NEq] then return $ opE o v v'
 		else let (VInt n1) = v in let (VInt n2) = v' in return $ op o n1 n2
 eval (EPost i o) = do
 	(VInt n) <- getVariableValue i
@@ -49,7 +48,7 @@ eval EReadB = do
 getWord :: IO String
 getWord =  do
 	c <- getChar
-	if inList c [' ', '\n', '\t', '\r']
+	if elem c [' ', '\n', '\t', '\r']
 		then return ""
 		else do
 			l <- getWord