X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=0335e74d763e3cf2575046282805c6d8da310791;hb=b6c2892b454651c4f3b2412d5b36f273ef6a3128;hp=c7a41e95b860f5af510c9332a641d9c896d79ce0;hpb=2953e6cc260d8243e5434b7e787258ab073d34d2;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index c7a41e9..0335e74 100644
--- a/sem.icl
+++ b/sem.icl
@@ -16,6 +16,7 @@ from StdFunc import id, const, o
 import StdString
 import StdTuple
 import StdList
+import StdBool
 
 from Text import class Text(concat), instance Text String
 
@@ -48,6 +49,22 @@ 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]
@@ -73,23 +90,36 @@ sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
     Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
 where 
     m :: Env ([VarDecl], [FunDecl])
-    m = (mapM semVarDecl vd) >>= \vds -> 
+    m = mapM semVarDecl vd >>= \vds ->
         mapM semFunDecl fd >>= \fds -> 
         pure (vds, fds)
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl fd=:(FunDecl p f _ mt vds stmts) = case mt of 
-    Nothing = let t = IdType f in putIdent f t >>| pure fd
-    Just t = putIdent f t >>| pure fd
+semFunDecl fd=:(FunDecl p f args mt vds stmts) = (case mt of
+    Nothing = let t = IdType f in putIdent f t >>| pure t//typeFun f args
+    Just t = putIdent f t >>| pure t) >>= \ft ->
+    mapM_ semVarDecl vds >>| 
+    mapM_ (checkStmt $ resultType ft) stmts >>| pure fd 
+    //case mt of 
+//    Nothing = let t = IdType f in putIdent f t >>| pure fd
+//    Just t = putIdent f t >>| pure fd
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl (VarDecl pos type ident ex) = unify type ex
     >>= \t-> putIdent ident t >>| (pure $ VarDecl pos t ident ex)
 
-typeOp2 :: Expr Expr Op2 [Type] -> Env Type
-typeOp2 e1 e2 op ts = typeExpr e1 >>= \t1-> typeExpr e2 >>= \t2->
-	unify t1 t2	>>= \t3->if (isMember t3 ts) (pure t3)
-		(liftT $ Left $ OperatorError (extrPos e1) op t3)
+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 (AssStmt (VarDef ident fs) e) = undef
+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
+
+all :: [Bool] -> Bool
+all as = foldr (&&) True as
 
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure IntType
@@ -101,31 +131,46 @@ typeExpr (TupleExpr p (e1, e2)) = typeExpr e1
     >>= \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]
+	typeOp2 e1 e2 op [IntType] IntType
 | isMember op [BiEquals, BiUnEqual] =
-	typeOp2 e1 e2 op [IntType, BoolType, CharType]
+	typeOp2 e1 e2 op [IntType, BoolType, CharType] BoolType
 | isMember op [BiLesser, BiGreater, BiLesserEq, BiGreaterEq] =
-	typeOp2 e1 e2 op [IntType, CharType]
+	typeOp2 e1 e2 op [IntType, CharType] BoolType
 | isMember op [BiAnd, BiOr] =
-	typeOp2 e1 e2 op [BoolType]
+	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
-//ignore field selectors
-typeExpr (FunExpr p (FunCall f es)) = gets (\(st, r)->'Map'.get f st)
-    >>= \mt-> case mt of
-        Nothing = let t = IdType f in putIdent f t >>| pure t
-        Just t = unifyApp t es
+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 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 //whoop whoop, functions can return functions
-unifyApp (tf1 ->> tf2) [t1:ts] = (->>) <$> unify tf1 t1 <*> (unifyApp tf2 ts)
-unifyApp t1 t2 = liftT $ Left $ UnifyError zero t1 (IdType "[expressions, FIXME")
+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
 
@@ -145,29 +190,12 @@ instance unify Expr where
 	unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
 			"Expression cannot be an polymorf type."
     unify VarType e = typeExpr e
-    unify (IdType i) e = undef
     //we have to cheat to decorate the error, can be done nicer?
     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 
 
-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 unify Type where
 	unify IntType IntType = pure IntType
 	unify BoolType BoolType = pure BoolType
@@ -176,6 +204,8 @@ instance unify Type where
     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 t1 t2 = liftT $ Left $ UnifyError zero t1 t2
 
 instance zero Pos where
@@ -206,5 +236,3 @@ instance toString Gamma where
 	toString (mp, _) = concat
 		[concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]
 
-
-// class free a :: a -> Env [a]