-//Int
-typeExpr (Op2Expr p e1 BiPlus e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiMinus e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiTimes e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiDivide e2) = unify IntType e1 >>| unify IntType e2
-typeExpr (Op2Expr p e1 BiMod e2) = unify IntType e1 >>| unify IntType e2
-//bool, char of int
-typeExpr (Op2Expr p e1 BiEquals e2) = typeExpr e1 >>= \t1 -> unify t1 e2
- >>| pure BoolType //todo, actually check t1 in Char,Bool,Int
-typeExpr (Op2Expr p e1 BiUnEqual e2) = typeExpr (Op2Expr p e1 BiEquals e2)
-//char of int
-typeExpr (Op2Expr p e1 BiLesser e2) = typeExpr e1 >>= \t1 -> unify t1 e2
- >>| pure BoolType //todo, actually check t1 in Char, Int
-typeExpr (Op2Expr p e1 BiGreater e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-typeExpr (Op2Expr p e1 BiLesserEq e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-typeExpr (Op2Expr p e1 BiGreaterEq e2) = typeExpr (Op2Expr p e1 BiLesser e2)
-//bool
-typeExpr (Op2Expr p e1 BiAnd e2) = unify BoolType e1 >>| unify BoolType e2
-typeExpr (Op2Expr p e1 BiOr e2) = unify BoolType e1 >>| unify BoolType e2
-//a
-typeExpr (Op2Expr p e1 BiCons e2) = typeExpr e1 >>= \t1-> typeExpr e2
- >>= \t2-> unify (ListType t1) t2
-//typeExpr (FunExpr p FunCall) = undef
-typeExpr (EmptyListExpr p) = pure $ ListType IntType //we'll need quantified types
-//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to
- //put the infered type in the context
+typeExpr (Op2Expr p e1 op e2)
+| isMember op [BiPlus, BiMinus, BiTimes, BiDivide, BiMod] =
+ typeOp2 e1 e2 op [IntType] IntType
+| isMember op [BiEquals, BiUnEqual] =
+ typeOp2 e1 e2 op [IntType, BoolType, CharType] BoolType
+| isMember op [BiLesser, BiGreater, BiLesserEq, BiGreaterEq] =
+ typeOp2 e1 e2 op [IntType, CharType] BoolType
+| isMember op [BiAnd, BiOr] =
+ typeOp2 e1 e2 op [BoolType] BoolType
+| op == BiCons = 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)) = 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 (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
+ >>= \mt->case mt of
+ Nothing = liftT $ Left $ UndeclaredVariableError p ident
+ Just t = unify t fs
+
+buildFunctionType :: String [Expr] -> Env Type
+buildFunctionType frsh [] = let t = IdType frsh in putIdent frsh t >>| pure t
+buildFunctionType frsh [e:es] = (->>) <$> typeExpr e <*> buildFunctionType frsh es
+
+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]")