From cba53fea01b27f46668e9025f8b04ce7a85e62d8 Mon Sep 17 00:00:00 2001
From: pimjager <pim@pimjager.nl>
Date: Wed, 13 Apr 2016 13:00:56 +0200
Subject: [PATCH 1/1] Undeclared error en untested function typing

---
 examples/varEx.spl |  4 ++--
 sem.dcl            |  1 +
 sem.icl            | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/examples/varEx.spl b/examples/varEx.spl
index 68aa4f6..9182da2 100644
--- a/examples/varEx.spl
+++ b/examples/varEx.spl
@@ -17,8 +17,8 @@ var l = 1:2:[];
 
 var m = 4;
 var n = m + 2;
-var q = v + 2;
-var z = !v;
+//var o = v + 2;
+//var p = !v;
 
 
 facR(n) :: Int -> Int {
diff --git a/sem.dcl b/sem.dcl
index 0332076..0d4a7d6 100644
--- a/sem.dcl
+++ b/sem.dcl
@@ -9,6 +9,7 @@ from StdOverloaded import class toString
 	= ParseError Pos String 
 	| UnifyError Pos Type Type 
     | FieldSelectorError Pos Type FieldSelector 
+    | UndeclaredVariableError Pos String
 	| Error String
 :: Gamma
 :: SemOutput :== Either [SemError] (AST, Gamma)
diff --git a/sem.icl b/sem.icl
index 75ecd37..cd415c5 100644
--- a/sem.icl
+++ b/sem.icl
@@ -60,6 +60,8 @@ instance toString SemError where
         toString p,
         "SemError: Cannot select ", toString fs, " from type: ",
         toString t]
+    toString (UndeclaredVariableError p ident) = concat [
+        toString p, "SemError: identifier: ", ident, " undefined."]
 
 sem :: AST -> SemOutput
 sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
@@ -110,12 +112,21 @@ typeExpr (Op2Expr p e1 BiCons e2) = typeExpr e1 >>= \t1-> typeExpr 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)) = undef
+typeExpr (FunExpr p (FunCall f es)) = gets (\(st, r)->'Map'.get f st)
+    >>= \mt-> case mt of
+        Nothing = undef
+        Just t = unifyApp t es
 //ignore field selectors
 typeExpr (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
-        >>= \mt->case mt of
-            Nothing = let t = IdType ident in putIdent ident t >>| pure t
-            Just t = unify t fs
+    >>= \mt->case mt of
+        Nothing = liftT $ Left $ UndeclaredVariableError p ident
+            //let t = IdType ident in putIdent ident t >>| pure t
+        Just t = unify t fs
+
+unifyApp :: Type [Expr] -> Env Type
+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")
 
 class unify a :: Type a -> Env Type
 
-- 
2.20.1