Merge branch 'master' of https://github.com/dopefishh/cc1516

[cc1516.git] / sem.icl

diff --git a/sem.icl b/sem.icl
index ffe95dd..0335e74 100644 (file)
--- a/sem.icl
+++ b/sem.icl
@@ -95,11 +95,14 @@ where
         pure (vds, fds)
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl fd=:(FunDecl p f _ mt vds stmts) = 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
+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
@@ -111,7 +114,7 @@ checkStmt t (IfStmt c st se) = unify BoolType c >>| mapM (checkStmt t) st
 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) = typeFun funcall >>| pure r
+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
 
@@ -139,7 +142,7 @@ typeExpr (Op2Expr p e1 op 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) = typeFun funcall
+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
@@ -159,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
@@ -198,12 +211,6 @@ instance unify Type where
 instance zero Pos where
        zero = {line=0,col=0}
 
-typeFun :: FunCall -> Env Type
-typeFun (FunCall 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
@@ -229,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]