a

[cc1516.git] / sem.icl

diff --git a/sem.icl b/sem.icl
index 0146c3a..8dff548 100644 (file)
--- a/sem.icl
+++ b/sem.icl
@@ -90,16 +90,19 @@ 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 semFunDecl fd >>= \fds -> 
-        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) = 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
@@ -108,18 +111,12 @@ semVarDecl (VarDecl pos type ident ex) = unify type 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 (WhileStmt c [et]) = undef
+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 (FunStmt (FunCall f es)) = 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)) = typeExpr e >>= \te -> unify t te 
-    >>| pure r
-
-all :: [Bool] -> Bool
-all as = foldr (&&) True as
-
-last :: [a] -> a
-last as = foldl (\_ r -> r) (hd as) as
+checkStmt t r=:(ReturnStmt (Just e)) = unify t e >>| pure r
 
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure IntType
@@ -142,11 +139,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 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
+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
@@ -166,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
@@ -184,7 +187,6 @@ 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
@@ -231,5 +233,3 @@ instance toString Gamma where
        toString (mp, _) = concat
                [concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]
 
-
-// class free a :: a -> Env [a]