X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=a58b2e111e9573947e14227c3dc0df3f7e24b45b;hb=6d70a636ed3b4573c4c81ba068ae2b46523c9465;hp=4038c0face098446954d8fba712fbec949bd56bb;hpb=6e5d435a99f84ad4f4f7cb4f6a41c28b79c29ab3;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 4038c0f..a58b2e1 100644
--- a/sem.icl
+++ b/sem.icl
@@ -3,6 +3,7 @@ implementation module sem
 import qualified Data.Map as Map
 from Data.Func import $
 import Data.Maybe
+import Data.Void
 import Data.Either
 import Data.Functor
 import Control.Applicative
@@ -10,138 +11,230 @@ import Control.Monad
 import Control.Monad.State
 import Control.Monad.Identity
 import Math.Random
+import Control.Monad.Trans
 import StdMisc
 from StdFunc import id, const, o
 import StdString
 import StdTuple
 import StdList
+import StdBool
+import GenEq
 
 from Text import class Text(concat), instance Text String
 
 import AST
-from parse import :: ParserOutput, :: Error
 
 :: Gamma :== ('Map'.Map String Type, [String])
-:: Env a :== (State Gamma (Either SemError a))
+:: Env a :== StateT Gamma (Either SemError) a
+//StateT (Gamma -> Either SemError (a, Gamma))
 
-get = state $ \s -> (s,s)
+//we need to redefine this even though it is in Control.Monad.State
+instance MonadTrans (StateT Gamma) where
+    liftT m = StateT \s-> m >>= \a-> return (a, s)
 
-getRandomStream :: Int -> [String]
-getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
-	where
-		genIdents r = let (ic, r) = splitAt 5 r in [toString ic: genIdents r]
+get :== gets id
 
-freshIdent :: Gamma -> (String, Gamma)
-freshIdent (st, [ident:rest]) = case 'Map'.get ident st of
-	Nothing = (ident, (st, rest))
-	_ = freshIdent (st, rest)
+sem :: AST -> SemOutput
+sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
+    Left e = Left [e]
+    Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
+where 
+    m :: Env ([VarDecl], [FunDecl])
+    m = mapM semVarDecl vd >>= \vd1 ->
+        mapM semFunDecl fd >>= \fd1 -> 
+    	mapM semVarDecl vd1 >>= \vd2 ->
+        mapM semFunDecl fd1 >>= \fd2 -> 
+    	mapM semVarDecl vd2 >>= \vd3 ->
+        mapM semFunDecl fd2 >>= \fd3 -> 
+    	mapM semVarDecl vd3 >>= \vd4 ->
+        mapM semFunDecl fd3 >>= \fd4 ->  //Dit is puur om te proberen
+        pure (vd4, fd4)
 
-putIdent :: String Type -> Env Void
-putIdent i t = gets (\(st, r)->'Map'.get i st) >>= \mt -> case mt of
-    Nothing = pure <$> modify (\(st, r)->('Map'.put i t st, r))
-    Just t2 = unify t t2 >>= \r -> case r of
-        Left e  = pure $ Left e
-        Right t3 = pure <$> modify (\(st, r)->('Map'.put i t3 st, r))
+semFunDecl :: FunDecl -> Env FunDecl
+semFunDecl fd=:(FunDecl p f args mt vds stmts) = 
+    (case mt of
+        Nothing = genType args >>= \infft->putIdent f infft >>| pure infft
+        Just t = putIdent f t >>| pure t) >>= \ft ->
+    saveGamma >>= \gamma ->
+ 	matchFunctions args ft >>= \tres->
+    mapM semVarDecl vds >>= \newvds->
+    mapM (checkStmt tres) stmts >>= \newstmts->
+	inferReturnType stmts >>= \returntype`->
+	unify returntype` tres >>= \returntype->
+	case mt of
+		Nothing = reconstructType args tres
+			>>= \ftype`->recoverType ftype`
+			>>= \ftype->restoreGamma gamma 
+			>>| putIdent f ftype >>| pure (
+			FunDecl p f args (Just ftype) newvds newstmts)
+		Just t = restoreGamma gamma >>| updateFunType t returntype
+			>>= \tt-> pure (FunDecl p f args (Just tt) newvds newstmts) 
 
-instance toString SemError where
-	toString (ParseError p e) = concat [
-		toString p,"SemError: ParseError: ", e]
-	toString (Error e) = "SemError: " +++ e
-	toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1 t2)
-	toString (UnifyError p t1 t2) = concat [
-		toString p,
-		"SemError: Cannot unify types. Expected: ",
-		toString t1, ". Given: ", toString t2]
+recoverType :: Type -> Env Type
+recoverType (IdType ident) = gets (\(st, r)->'Map'.get ident st)
+	>>= \mt->case mt of
+		Nothing = pure (IdType ident)
+		Just t = pure t
+recoverType (t1 ->> t2) = recoverType t1 >>= \t1`->recoverType t2 
+	>>= \t2`->pure (t1` ->> t2`) 
+recoverType t = pure t
 
-sem :: AST -> SemOutput
-sem (AST vd fd)
-# (eithervds, gamma) = runState (mapM semVarDecl vd) ('Map'.newMap, getRandomStream 0)
-# (eitherfds, gamma) = runState (mapM semFunDecl fd) gamma
-= case splitEithers eithervds of
-	(Left errs) = Left $ errs ++ [x\\(Left x)<-eitherfds]
-	(Right vds) = case splitEithers eitherfds of
-		(Left errs) = Left errs
-		(Right fds) = Right $ AST vds fds
-
-splitEithers :: [Either a b] -> Either [a] [b]
-splitEithers [] = Right []
-splitEithers [Right x:xs] = splitEithers xs >>= \rest->Right [x:rest]
-splitEithers xs = Left $ [x\\(Left x)<-xs]
+updateFunType :: Type Type -> Env Type
+updateFunType (t1 ->> t2) t3 = updateFunType t2 t3 >>= \t2`->pure $ t1 ->> t2`
+updateFunType t1 t2 = unify t1 t2
 
-semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl f = pure $ Right f
+inferReturnType :: [Stmt] -> Env Type
+inferReturnType [] = pure VoidType
+inferReturnType [ReturnStmt (Just t):rest] = typeExpr t 
+	>>= \tx->inferReturnType rest >>= \ty->unify tx ty
+inferReturnType [ReturnStmt _:rest] = 
+	inferReturnType rest >>= \tx-> unify VoidType tx
+inferReturnType [_:rest] = inferReturnType rest
+
+reconstructType :: [String] Type -> Env Type
+reconstructType [] t = pure t
+reconstructType [x:xs] t = gets (\(st, r)->'Map'.get x st)
+	>>= \mtype->case mtype of
+		Nothing = liftT $ Left $ Error "Not used ????"
+		Just type = reconstructType xs t >>= \resttype->pure (type ->> resttype)
+
+genType :: [String] -> Env Type
+genType [] = freshIdent >>= \fi->pure $ IdType fi
+genType [x:xs] = liftM2 (->>) (freshIdent >>= \fi->pure $ IdType fi)
+	(genType xs)
+
+matchFunctions :: [String] Type -> Env Type
+matchFunctions [] (_ ->> _) = liftT $ Left $ 
+	ArgumentMisMatchError zero "Not enough arguments"
+matchFunctions _ (VoidType ->> _) = liftT $ Left $ 
+	ArgumentMisMatchError zero "Void can't be a non return type"
+matchFunctions [x:xs] (t1 ->> t2) = 
+	modify (\(st, r)->('Map'.put x t1 st, r)) >>| matchFunctions xs t2
+matchFunctions [] t = pure t
+matchFunctions _ t = liftT $ Left $ 
+	ArgumentMisMatchError zero "Too much argumnts"
 
 semVarDecl :: VarDecl -> Env VarDecl
-semVarDecl vd=:(VarDecl pos type ident ex) = unify type ex
-	>>= \et->case et of
-		Left err = pure $ Left err
-		Right t = putIdent ident t >>| pure (Right $ VarDecl pos t ident ex)
+semVarDecl (VarDecl pos type ident ex) = unify type ex
+    >>= \t-> putIdent ident t >>| (pure $ VarDecl pos t ident ex)
+
+checkStmt ::Type Stmt -> Env Stmt
+checkStmt t (IfStmt c st se) = unify BoolType c >>| mapM (checkStmt t) st 
+    >>= \st1-> mapM (checkStmt t) se >>= \se1-> pure (IfStmt c st1 se1)
+checkStmt t w=:(WhileStmt c et) = unify BoolType c >>| mapM (checkStmt t) et
+    >>= \et1-> pure w
+checkStmt t a=:(AssStmt (VarDef ident fs) e) = gets (\(st, r)->'Map'.get ident st)
+    >>= \mt->case mt of
+        Nothing = liftT $ Left $ UndeclaredVariableError zero ident
+        Just t = unify t fs >>= \t1 -> unify t1 e >>| pure a
+checkStmt t r=:(FunStmt (FunCall f es)) = typeFun f es >>| pure r
+checkStmt VoidType r=:(ReturnStmt Nothing) = pure r
+checkStmt t r=:(ReturnStmt (Just e)) = unify t e >>| pure r
 
 typeExpr :: Expr -> Env Type
-typeExpr (IntExpr _ _) = pure $ Right IntType
-typeExpr (CharExpr _ _) = pure $ Right CharType
-typeExpr (BoolExpr _ _) = pure $ Right BoolType
+typeExpr (IntExpr _ _) = pure IntType
+typeExpr (CharExpr _ _) = pure CharType
+typeExpr (BoolExpr _ _) = pure BoolType
 typeExpr (Op1Expr p UnNegation expr) = unify BoolType expr
 typeExpr (Op1Expr p UnMinus expr) = unify IntType expr
 typeExpr (TupleExpr p (e1, e2)) = typeExpr e1 
-	>>= \ete1->typeExpr e2 >>= \ete2->pure (
-		ete1 >>= \te1->ete2 >>= \te2->Right $ TupleType (te1, te2))
-//Int
-typeExpr (Op2Expr p e1 BiPlus e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiMinus e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiTimes e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiDivide e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiMod e2) = unify IntType e1 >>| unify IntType e2
-//bool, char of int
-typeExpr (Op2Expr p e1 BiEquals e2) = undef
-typeExpr (Op2Expr p e1 BiUnEqual e2) = undef
-//char of int
-typeExpr (Op2Expr p e1 BiLesser e2) = undef
-typeExpr (Op2Expr p e1 BiGreater e2) = undef
-typeExpr (Op2Expr p e1 BiLesserEq e2) = undef
-typeExpr (Op2Expr p e1 BiGreaterEq e2) = undef
-//bool
-typeExpr (Op2Expr p e1 BiAnd e2) = undef
-typeExpr (Op2Expr p e1 BiOr e2) = undef
-//a
-typeExpr (Op2Expr p e1 BiCons e2) = undef
-//typeExpr (FunExpr Pos FunCall) = undef
-//typeExpr (EmptyListExpr Pos) = undef
-//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to
-//put the infered type
-                                        //in the context
+    >>= \t1-> typeExpr e2 >>= \t2-> pure $ TupleType (t1, t2)
+typeExpr (Op2Expr p e1 op e2)
+| isMember op [BiPlus, BiMinus, BiTimes, BiDivide, BiMod] =
+	typeOp2 e1 e2 op [IntType] IntType
+| isMember op [BiEquals, BiUnEqual] =
+	typeOp2 e1 e2 op [IntType, BoolType, CharType] BoolType
+| isMember op [BiLesser, BiGreater, BiLesserEq, BiGreaterEq] =
+	typeOp2 e1 e2 op [IntType, CharType] BoolType
+| isMember op [BiAnd, BiOr] =
+	typeOp2 e1 e2 op [BoolType] BoolType
+| op == BiCons = typeExpr e1 >>= \t1-> typeExpr e2 
+	>>= \t2-> unify (ListType t1) t2
+typeExpr (EmptyListExpr p) = freshIdent >>= \frsh-> let t = IdType frsh in
+    putIdent frsh t >>| pure t
+typeExpr (FunExpr p (FunCall f es)) = typeFun f es
+typeExpr (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
+    >>= \mt->case mt of
+        Nothing = liftT $ Left $ UndeclaredVariableError p ident
+        Just t = unify t fs
+typeOp2 :: Expr Expr Op2 [Type] Type -> Env Type
+typeOp2 e1 e2 op ts ret = typeExpr e1 >>= \t1-> typeExpr e2 >>= \t2->
+    unify t1 t2 >>= \t3->if (isMember t3 [IdType "":ts]) (pure ret)
+        (liftT $ Left $ OperatorError (extrPos e1) op t3)
+
+buildFunctionType :: String [Expr] -> Env Type 
+buildFunctionType frsh [] = let t = IdType frsh in putIdent frsh t >>| pure t
+buildFunctionType frsh [e:es] = (->>) <$> typeExpr e <*> buildFunctionType frsh es
+
+unifyApp :: Type [Expr] -> Env Type
+unifyApp t [] = pure t
+unifyApp (tf1 ->> tf2) [t1:ts] = unify tf1 t1 >>| unifyApp tf2 ts
+unifyApp t1 t2 = liftT $ Left $ UnifyError zero t1 (IdType "[expressions, FIXME]")
+
+typeFun :: String [Expr] -> Env Type
+typeFun f es = gets (\(st, r)->'Map'.get f st) >>= \mt-> case mt of
+    Nothing = freshIdent >>= \frsh-> buildFunctionType frsh es 
+        >>= \ft-> putIdent f ft >>| (pure $ IdType frsh)
+    Just t = unifyApp t es
+
+resultType :: Type -> Type
+resultType (_ ->> t) = resultType t
+resultType t = t
 
 class unify a :: Type a -> Env Type
 
+instance unify [FieldSelector] where
+    unify t [] = pure t
+    unify (ListType t) [FieldHd:fs] = unify t fs
+    unify t=:(ListType _) [FieldTl:fs] = unify t fs
+    unify (TupleType (t, _)) [FieldFst:fs] = unify t fs
+    unify (TupleType (_, t)) [FieldSnd:fs] = unify t fs
+    unify t [fs:_] = liftT $ Left $ FieldSelectorError zero t fs
+
 instance unify Expr where
-	unify (_ ->> _) e = pure $ Left $ ParseError (extrPos e)
+	unify (_ ->> _) e = liftT $ Left $ ParseError (extrPos e)
 			"Expression cannot be a higher order function. Yet..."
-	unify VoidType e = pure $ Left $ ParseError (extrPos e)
+	unify VoidType e = liftT $ Left $ ParseError (extrPos e)
 			"Expression cannot be a Void type."
-	unify (IdType _) e = pure $ Left $ ParseError (extrPos e)
-			"Expression cannot be an polymorf type."
+//	unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
+//			"Expression cannot be an polymorf type."
     unify VarType e = typeExpr e
-	unify t e = typeExpr e
-		>>= \eithertype->case eithertype of
-			Left e = pure $ Left e
-			Right tex = unify t tex >>= \eitherun->case eitherun of
-				Left err = pure $ Left $ decErr e err
-				Right t = pure $ Right t
+    //we have to cheat to decorate the error, can be done nicer?
+	unify t=:(IdType id) e = typeExpr e >>= \tex->unify t tex
+		>>= \type->putIdent id type >>| pure type
+    unify t e = StateT $ \s0 -> let res = runStateT m s0 in case res of
+        Left err = Left $ decErr e err
+        Right t = Right t //note, t :: (Type, Gamma) 
+    where m = typeExpr e >>= \tex-> unify t tex 
 
 instance unify Type where
-	unify IntType IntType = pure $ Right IntType
-	unify BoolType BoolType = pure $ Right BoolType
-	unify CharType CharType = pure $ Right CharType
-	unify t1 t2 = pure $ Left $ UnifyError zero t1 t2
+	unify IntType IntType = pure IntType
+	unify BoolType BoolType = pure BoolType
+	unify CharType CharType = pure CharType
+    unify (IdType i) t=:(IdType j) = replace i t >>| pure t
+    unify t (IdType i) = unify (IdType i) t
+    unify (IdType i) t = replace i t >>| pure t
+    unify (ListType t1) (ListType t2) = unify t1 t2 >>| (pure $ ListType t1)
+    unify (ta1 ->> ta2) (tb1 ->> tb2) = unify ta1 tb1 >>= \ta-> unify ta2 tb2 
+        >>= \tb-> pure (ta ->> tb)
+    unify VoidType VoidType = pure VoidType
+    unify VoidType t = pure t
+    unify t VoidType = pure t
+	unify t1 t2 = liftT $ Left $ UnifyError zero t1 t2
 
 instance zero Pos where
 	zero = {line=0,col=0}
 
 decErr :: Expr SemError -> SemError
 decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
+decErr e (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs
 decErr e (ParseError _ s) = ParseError (extrPos e) s
 decErr e err = err
 
+dc2 :: Expr (Either SemError a) -> Either SemError a
+dc2 e (Right t) = Right t
+dc2 e (Left err) = Left err
+
 extrPos :: Expr -> Pos
 extrPos (VarExpr p _) = p
 extrPos (Op2Expr p _ _ _) = p
@@ -152,3 +245,69 @@ extrPos (BoolExpr p _) = p
 extrPos (FunExpr p _) = p
 extrPos (EmptyListExpr p) = p
 extrPos (TupleExpr p _) = p
+
+instance toString Gamma where
+	toString (mp, _) = concat
+		[concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]
+
+getRandomStream :: Int -> [String]
+getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
+    where
+        genIdents r = let (ic, r2) = splitAt 5 r in [toString ic: genIdents r2]
+
+freshIdent :: Env String
+freshIdent = get >>= \(st, [ident:rest])-> put (st, rest) 
+    >>| case 'Map'.get ident st of
+        Nothing = pure ident
+        _       = freshIdent
+
+putIdent :: String Type -> Env Void
+putIdent i t = gets (\(st, r)->'Map'.get i st) >>= \mt -> case mt of
+    Nothing = modify (\(st, r)->('Map'.put i t st, r))
+    Just t2 = unify t t2 >>= \t3-> modify (\(st, r)->('Map'.put i t3 st, r))
+
+replace :: String Type -> Env Void
+replace ident type = get >>= \(st, fr)->put ('Map'.fromList $ 
+        map (itupdate ident type) ('Map'.toList st), fr)
+    where
+        itupdate :: String Type (String, Type) -> (String, Type)
+        itupdate ident newtype ov=:(key, IdType type) = if (ident == type)
+            (key, newtype) ov
+        itupdate ident newtype (key, TupleType (t1, t2))
+        # (_, t1) = itupdate ident newtype (key, t1)
+        # (_, t2) = itupdate ident newtype (key, t2)
+        = (key, TupleType (t1, t2))
+        itupdate ident newtype (key, ListType t1)
+        # (_, t1) = itupdate ident newtype (key, t1)
+        = (key, ListType t1)
+        itupdate _ _ k = k
+
+instance toString SemError where
+    toString (ParseError p e) = concat [toString p,
+		"SemError: ParseError: ", e]
+    toString (UnifyError p t1 t2) = concat [ toString p,
+        "SemError: Cannot unify types. Expected: ",
+        toString t1, ". Given: ", toString t2]
+    toString (FieldSelectorError p t fs) = concat [ toString p,
+        "SemError: Cannot select ", toString fs, " from type: ",
+        toString t]
+    toString (OperatorError p o t) = concat [
+        toString p, 
+        "SemError: No ", toString o, " for type ",
+        toString t]
+    toString (UndeclaredVariableError p ident) = concat [
+        toString p, "SemError: identifier: ", ident, " undefined."]
+    toString (ArgumentMisMatchError p s) = concat [toString p,
+		"SemError: Argument mismatch: ", s]
+    toString (Error e) = "SemError: " +++ e
+
+saveGamma :: Env Gamma
+saveGamma = get
+
+restoreGamma :: Gamma -> Env Void
+restoreGamma (oldstate, _) = gets snd >>= \newr->put (oldstate, newr)
+
+derive gEq Type
+instance == Type where 
+	(==) (IdType _) (IdType _) = True
+	(==) o1 o2 = gEq{|*|} o1 o2