From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 13 Apr 2016 19:35:25 +0000 (+0200)
Subject: .
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=b76ab64a1088a8d2fcf1b107d726403269be6468;p=cc1516.git

.
---

diff --git a/examples/test.spl b/examples/test.spl
index e6a7f05..bdcb0ed 100644
--- a/examples/test.spl
+++ b/examples/test.spl
@@ -1,6 +1,10 @@
 Bool n = True;
 
+test(x) {
+	return f(x);
+}
 f(n) :: Int -> Int{
 	var m = n+1;
 	return n;
 }
+
diff --git a/sem.icl b/sem.icl
index 727fc1e..24fa7a9 100644
--- a/sem.icl
+++ b/sem.icl
@@ -41,26 +41,47 @@ sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
 where 
     m :: Env ([VarDecl], [FunDecl])
     m = mapM semVarDecl vd >>= \vds ->
-        mapM semFunDecl fd >>= \fds -> 
-        pure (vds, fds)
+        mapM semFunDecl fd >>= \fds1 -> 
+        mapM semFunDecl fds1 >>= \fds2 -> 
+        pure (vds, fds2)
 
 semFunDecl :: FunDecl -> Env FunDecl
 semFunDecl fd=:(FunDecl p f args mt vds stmts) = 
-    saveGamma >>= \gamma ->
     (case mt of
-        Nothing = let t = IdType f in putIdent f t >>| pure t
+        Nothing = genType args >>= \infft->putIdent f infft >>| pure infft
         Just t = putIdent f t >>| pure t) >>= \ft ->
- 	matchFunctions args ft >>|
+    saveGamma >>= \gamma ->
+ 	matchFunctions args ft >>= \tres->
     mapM semVarDecl vds >>= \newvds->
-    mapM_ (checkStmt $ resultType ft) stmts >>| 
-    restoreGamma gamma >>| 
-	pure (FunDecl p f args mt newvds stmts) 
-
-matchFunctions :: [String] Type -> Env Void
-matchFunctions [] (_ ->> _) = liftT $ Left $ Error "Niet genoeg argumentenerror"
-matchFunctions [] t = pure Void
+    mapM (checkStmt tres) stmts >>= \newstmts->
+	pure IntType >>= \returntype->
+	case mt of
+		Nothing = reconstructType args returntype 
+    		>>= \ftype->restoreGamma gamma 
+			>>| putIdent f ftype >>| pure (
+			FunDecl p f args (Just ftype) newvds newstmts) 
+		Just t = restoreGamma gamma 
+			>>| pure (FunDecl p f args mt newvds newstmts) 
+
+reconstructType :: [String] Type -> Env Type
+reconstructType [] t = pure t
+reconstructType [x:xs] t = gets (\(st, r)->'Map'.get x st)
+	>>= \mtype->case mtype of
+		Nothing = liftT $ Left $ Error "Not used ????"
+		Just type = reconstructType xs t >>= \resttype->pure (type ->> resttype)
+
+genType :: [String] -> Env Type
+genType [] = freshIdent >>= \fi->pure $ IdType fi
+genType [x:xs] = liftM2 (->>) (freshIdent >>= \fi->pure $ IdType fi)
+	(genType xs)
+
+matchFunctions :: [String] Type -> Env Type
+matchFunctions [] (_ ->> _) = liftT $ Left $ Error "Not enough arguments"
+matchFunctions _ (VoidType ->> _) = liftT $ Left $ Error "Cannot have a void type in the middle of the function definition"
 matchFunctions [x:xs] (t1 ->> t2) = 
 	modify (\(st, r)->('Map'.put x t1 st, r)) >>| matchFunctions xs t2
+matchFunctions [] t = pure t
+matchFunctions _ t = liftT $ Left $ Error "Too much argumnts"
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl (VarDecl pos type ident ex) = unify type ex
@@ -142,8 +163,8 @@ instance unify Expr where
 			"Expression cannot be a higher order function. Yet..."
 	unify VoidType e = liftT $ Left $ ParseError (extrPos e)
 			"Expression cannot be a Void type."
-	unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
-			"Expression cannot be an polymorf type."
+//	unify (IdType _) e = liftT $ Left $ ParseError (extrPos e)
+//			"Expression cannot be an polymorf type."
     unify VarType e = typeExpr e
     //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
@@ -246,4 +267,4 @@ saveGamma :: Env Gamma
 saveGamma = get
 
 restoreGamma :: Gamma -> Env Void
-restoreGamma g = put g
+restoreGamma (oldstate, _) = gets snd >>= \newr->put (oldstate, newr)