X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=8dff5482cedf75798d1dc64054076ce438fcf45f;hb=eebf260cfb0f6fa5c97250dabd50e7b98281a381;hp=3f4458a4d4371ea437fd04946f1d08caf10dd70f;hpb=157d00517b8542cc729beb49f675c8369343f268;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 3f4458a..8dff548 100644
--- a/sem.icl
+++ b/sem.icl
@@ -96,13 +96,13 @@ where
 
 semFunDecl :: FunDecl -> Env FunDecl
 semFunDecl fd=:(FunDecl p f args mt vds stmts) = (case mt of
-    Nothing = typeFun f args
-    Just t = putIdent f t) >>|
+    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 IntType) stmts >>| 
-    case mt of 
-    Nothing = let t = IdType f in putIdent f t >>| pure fd
-    Just t = putIdent f t >>| pure fd
+    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
@@ -113,14 +113,11 @@ 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) = 
+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
 typeExpr (CharExpr _ _) = pure CharType
@@ -162,6 +159,16 @@ 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]")
 
+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
@@ -201,14 +208,6 @@ instance unify Type where
 instance zero Pos where
 	zero = {line=0,col=0}
 
-typeFun :: String [String] -> 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
-
-
-
 decErr :: Expr SemError -> SemError
 decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
 decErr e (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs