readBool now reads integer values, where 0 is false and the rest is true, instead...

diff --git a/Interpret.hs b/Interpret.hs
index fd04dcd722d9e33d8b65a70c292c96bd161e48e4..8cf3c1b2657270d016c8f28256b993adbd566c96 100644 (file)
--- a/Interpret.hs
+++ b/Interpret.hs
@@ -9,7 +9,8 @@ data Value = VInt Integer | VBool Bool deriving Eq
 
 instance Show Value where
        show (VInt n) = show n
-       show (VBool b) = show b
+       show (VBool True) = "1"
+       show (VBool False) = "0"
 
 type Variables = [Map Ident Value]
 
@@ -22,7 +23,7 @@ eval :: Exp -> StateT Variables IO Value
 eval (EBool b) = return (VBool b)
 eval (EInt n) = return (VInt n)
 eval (EVar i) = getVariableValue i
-eval (EAss i e) = setVariableValue i e 
+eval (EAss i e) = setVariableValue i e
 eval (BiOpExp e o e') = do
        v <- eval e
        v'<- eval e'
@@ -43,24 +44,24 @@ eval EReadI = do
        return $ VInt $ read s
 eval EReadB = do
        s <- lift $ getWord
-       return $ VBool $ read s
+       return $ VBool $ if (read s == 0) then False else True
 
 getWord :: IO String
 getWord =  do
        c <- getChar
-       if inList c ['\n','\r',' ', '\t']
+       if inList c [' ', '\n', '\t', '\r']
                then return ""
                else do
                        l <- getWord
-                       return (c:l) 
+                       return (c:l)
 
 -- op :: Op -> (a -> a -> Value)
 opE Eq = \e e' -> VBool $ e == e'
 opE NEq = \e e' -> VBool $ not (e == e')
 op Plus = \e e' -> VInt $ e + e'
-op Minus = \e e' -> VInt $ e - e' 
-op Times = \e e' -> VInt $ e * e' 
-op Div = \e e' -> VInt $ e `div` e' 
+op Minus = \e e' -> VInt $ e - e'
+op Times = \e e' -> VInt $ e * e'
+op Div = \e e' -> VInt $ e `div` e'
 op Lt = \e e' -> VBool $ e < e'
 op ELt = \e e' -> VBool $ e <= e'
 op Gt = \e e' -> VBool $ e > e'
@@ -109,11 +110,10 @@ execute (SBlock ss) = pushAndPop $ mapM execute ss
 execute (SWhile e s) = do
        (VBool b) <- eval e
        if b then pushAndPop (execute s) >> execute (SWhile e s) else return ()
-execute (SDeclD t i) = execute (SDecl t i $ case t of
+execute (SDeclD t i) = execute $ SDecl t i $ case t of
        TInt -> EInt 0
        TBool -> EBool False
-       )
 execute (SDecl t i e) =do
-       e' <- eval e
+       v <- eval e
        (m:ms) <- get
-       put $ (insert i e' m):ms
+       put $ (insert i v m):ms