X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=a973a0223e787170fbd6e7013ad43476971c977d;hb=c9a2ff29fb4482fc1f43cf0386198a7d0e4a5f9b;hp=667b6eb24db9eb4530845742c826be87a6dfdc03;hpb=5b1c37a52f0d63d4972665f672df100a231a2f57;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 667b6eb..a973a02 100644
--- a/sem.icl
+++ b/sem.icl
@@ -9,6 +9,7 @@ import Control.Applicative
 import Control.Monad
 import Control.Monad.State
 import Control.Monad.Identity
+import Control.Monad.Trans
 import StdMisc
 from StdFunc import id, const
 import StdString
@@ -20,35 +21,37 @@ import AST
 from parse import :: ParserOutput, :: Error
 
 :: Gamma :== 'Map'.Map String Type
-:: Env a :== (State Gamma (Either SemError a))
+:: Env a :== StateT Gamma (Either SemError) a
 
-get = state $ \s -> (s,s)
+get = gets id
+
+instance toString SemError where
+    toString (ParseError p e) = concat [
+        toString p,"SemError: ParseError: ", e]
+    toString (Error e) = "SemError: " +++ e
+    toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1 t2)
+    toString (UnifyError p t1 t2) = concat [
+        toString p,
+        "SemError: Cannot unify types. Expected: ",
+        toString t1, ". Given: ", toString t2]
 
 putIdent :: String Type -> Env Void
-putIdent i t = gets ('Map'.get i) >>= \mt -> case mt of
+putIdent i t = undef
+/*putIdent i t = gets ('Map'.get i) >>= \mt -> case mt of
     Nothing = pure <$> modify ('Map'.put i t)
     Just t2 = unify t t2 >>= \r -> case r of
         Left e  = pure $ Left e
-        Right t3 = pure <$> modify ('Map'.put i t3)
-
-instance toString SemError where
-	toString (ParseError p e) = concat [
-		toString p,"SemError: ParseError: ", e]
-	toString (Error e) = "SemError: " +++ e
-	toString (UnifyError p t1 t2) = concat [
-		toString p,
-		"SemError: Cannot unify types. Expected: ",
-		toString t1, ". Given: ", toString t2]
+        Right t3 = pure <$> modify ('Map'.put i t3)*/
 
 sem :: AST -> SemOutput
-sem (AST vd fd)
-# (eithervds, gamma) = runState (mapM semVarDecl vd) 'Map'.newMap
-# (eitherfds, gamma) = runState (mapM semFunDecl fd) gamma
-= case splitEithers eithervds of
-	(Left errs) = Left $ errs ++ [x\\(Left x)<-eitherfds]
-	(Right vds) = case splitEithers eitherfds of
-		(Left errs) = Left errs
-		(Right fds) = Right $ AST vds fds
+sem (AST vd fd) = case evalStateT m 'Map'.newMap of
+    Left e = Left [e]
+    Right (vds, fds) = Right (AST vds fds)
+where 
+    m :: Env (([VarDecl], [FunDecl]))
+    m = (mapM semVarDecl vd) >>= \vds -> 
+        mapM semFunDecl fd >>= \fds -> 
+        pure (vds, fds)
 
 splitEithers :: [Either a b] -> Either [a] [b]
 splitEithers [] = Right []
@@ -56,59 +59,85 @@ splitEithers [Right x:xs] = splitEithers xs >>= \rest->Right [x:rest]
 splitEithers xs = Left $ [x\\(Left x)<-xs]
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl f = pure $ Right f
+semFunDecl f = pure f
 
 semVarDecl :: VarDecl -> Env VarDecl
-semVarDecl v = pure $ Right v
-//Right v
-//semVarDecl vd=:(VarDecl pos type ident expr) = case unify type expr of //	Left e = Left e
-//	//TODO ident in de environment
-//	Right e = Right $ pure vd
-
-typeOp1 :: Pos Expr Type -> Env Type
-typeOp1 p expr rtype = typeExpr expr >>= \exprtype->case exprtype of
-	Left e = pure $ Left e
-	Right rtype = pure $ Right rtype
-	Right (IdType ident) = putIdent ident rtype >>| pure (Right rtype)
-	Right t = pure $ Left $ UnifyError p rtype t
+semVarDecl (VarDecl pos type ident ex) = unify type ex
+    >>= \t-> putIdent ident t >>| (pure $ VarDecl pos t ident ex)
 
 typeExpr :: Expr -> Env Type
-typeExpr (IntExpr _ _) = pure $ Right IntType
-typeExpr (CharExpr _ _) = pure $ Right CharType
-typeExpr (BoolExpr _ _) = pure $ Right BoolType
-typeExpr (Op1Expr p UnNegation expr) = typeOp1 p expr BoolType
-typeExpr (Op1Expr p UnMinus expr) = typeOp1 p expr IntType
+typeExpr (IntExpr _ _) = pure IntType
+typeExpr (CharExpr _ _) = pure CharType
+typeExpr (BoolExpr _ _) = pure BoolType
+typeExpr (Op1Expr p UnNegation expr) = unify BoolType expr
+typeExpr (Op1Expr p UnMinus expr) = unify IntType expr
 typeExpr (TupleExpr p (e1, e2)) = typeExpr e1 
-	>>= \ete1->typeExpr e2 >>= \ete2->pure (
-		ete1 >>= \te1->ete2 >>= \te2->Right $ TupleType (te1, te2))
-//typeExpr (Op1Expr p UnMinus expr) = typeExpr expr 
-//	>>= \exprtype->case exprtype of
-//		IntType = pure $ Right IntType
-//		t = Left $ UnifyError p IntType exprtype
-//typeExpr (Op2Expr Pos Expr Op2 Expr) = undef
+    >>= \t1-> typeExpr e2 >>= \t2-> pure $ TupleType (t1, t2)
+//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) = undef
+typeExpr (Op2Expr p e1 BiUnEqual e2) = undef
+//char of int
+typeExpr (Op2Expr p e1 BiLesser e2) = undef
+typeExpr (Op2Expr p e1 BiGreater e2) = undef
+typeExpr (Op2Expr p e1 BiLesserEq e2) = undef
+typeExpr (Op2Expr p e1 BiGreaterEq e2) = undef
+//bool
+typeExpr (Op2Expr p e1 BiAnd e2) = undef
+typeExpr (Op2Expr p e1 BiOr e2) = undef
+//a
+typeExpr (Op2Expr p e1 BiCons e2) = undef
 //typeExpr (FunExpr Pos FunCall) = undef
 //typeExpr (EmptyListExpr Pos) = undef
-//typeExpr (VarExpr Pos VarDef) = undef
+//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to put the infered type
+                                        //in the context
 
 class unify a :: Type a -> Env Type
 
+instance unify Expr where
+	unify (_ ->> _) e = liftT $ Left $ ParseError (extrPos e)
+			"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 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
+        Left err = Left $ decErr e err
+        Right t = Right t //note, t :: (Type, Gamma) 
+    where m = typeExpr e >>= \tex-> unify t tex 
+
 instance unify Type where
-	unify IntType IntType = pure $ Right IntType
-	unify BoolType BoolType = pure $ Right BoolType
-	unify CharType CharType = pure $ Right CharType
-	unify _ _ = undef
-//
-//instance unify Expr where
-//	unify type expr = case type of
-//		_ ->> _ = Left $ ParseError (extrPos expr)
-//			"Expression cannot be a higher order function. Yet..."
-//		VoidType = Left $ ParseError (extrPos expr)
-//			"Expression cannot be a Void type."
-//		IdType _ = Left $ ParseError (extrPos expr)
-//			"Expression cannot be an polymorf type."
-//		TupleType (_, _) = undef
-//		ListType _ = undef
-//		IntType = undef
-//		BoolType = undef
-//		CharType = undef
-//		VarType = undef
+	unify IntType IntType = pure IntType
+	unify BoolType BoolType = pure BoolType
+	unify CharType CharType = pure CharType
+	unify t1 t2 = liftT $ Left $ UnifyError zero t1 t2
+
+instance zero Pos where
+	zero = {line=0,col=0}
+
+decErr :: Expr SemError -> SemError
+decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
+decErr e (ParseError _ s) = ParseError (extrPos e) s
+decErr e err = err
+
+dc2 :: Expr (Either SemError a) -> Either SemError a
+dc2 e (Right t) = Right t
+dc2 e (Left err) = Left err
+
+extrPos :: Expr -> Pos
+extrPos (VarExpr p _) = p
+extrPos (Op2Expr p _ _ _) = p
+extrPos (Op1Expr p _ _) = p
+extrPos (IntExpr p _) = p
+extrPos (CharExpr p _) = p
+extrPos (BoolExpr p _) = p
+extrPos (FunExpr p _) = p
+extrPos (EmptyListExpr p) = p
+extrPos (TupleExpr p _) = p
\ No newline at end of file