From: pimjager <pim@pimjager.nl>
Date: Wed, 13 Apr 2016 17:26:54 +0000 (+0200)
Subject: Working on statement checking
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=b6c2892b454651c4f3b2412d5b36f273ef6a3128;hp=-c;p=cc1516.git

Working on statement checking
---

b6c2892b454651c4f3b2412d5b36f273ef6a3128
diff --git a/sem.icl b/sem.icl
index 3f4458a..0335e74 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,7 +113,7 @@ 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
@@ -162,6 +162,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 +211,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