X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=8c40fb5e68b5e423711310b06448ff0df47ba1e5;hb=fcb2ca9a7905e5f02431ebad7ac54dba256493e9;hp=99aa44a41f9b8cbf51d10dd8e3702fb74c222f13;hpb=8c4ec1c3287d6c6ddefd22ef608a4d97693e7e85;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 99aa44a..8c40fb5 100644
--- a/sem.icl
+++ b/sem.icl
@@ -9,9 +9,12 @@ import Control.Applicative
 import Control.Monad
 import Control.Monad.State
 import Control.Monad.Identity
+import Math.Random
+import Control.Monad.Trans
 import StdMisc
-from StdFunc import id, const
+from StdFunc import id, const, o
 import StdString
+import StdTuple
 import StdList
 
 from Text import class Text(concat), instance Text String
@@ -19,8 +22,31 @@ from Text import class Text(concat), instance Text String
 import AST
 from parse import :: ParserOutput, :: Error
 
-:: Gamma :== 'Map'.Map String Type
-:: Env a :== (State Gamma (Either SemError a))
+:: Gamma :== ('Map'.Map String Type, [String])
+:: Env a :== StateT Gamma (Either SemError) a
+//StateT (Gamma -> Either SemError (a, Gamma))
+
+//we need to redefine this even though it is in Control.Monad.State
+instance MonadTrans (StateT Gamma) where
+    liftT m = StateT \s-> m >>= \a-> return (a, s)
+
+get = gets id
+
+getRandomStream :: Int -> [String]
+getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
+	where
+		genIdents r = let (ic, r2) = splitAt 5 r in [toString ic: genIdents r2]
+
+freshIdent :: Env String
+freshIdent = get >>= \(st, [ident:rest])-> put (st, rest) 
+    >>| case 'Map'.get ident st of
+        Nothing = pure ident
+        _       = freshIdent
+
+putIdent :: String Type -> Env Void
+putIdent i t = gets (\(st, r)->'Map'.get i st) >>= \mt -> case mt of
+    Nothing = modify (\(st, r)->('Map'.put i t st, r))
+    Just t2 = unify t t2 >>= \t3-> modify (\(st, r)->('Map'.put i t3 st, r))
 
 instance toString SemError where
 	toString (ParseError p e) = concat [
@@ -30,81 +56,156 @@ instance toString SemError where
 		toString p,
 		"SemError: Cannot unify types. Expected: ",
 		toString t1, ". Given: ", toString t2]
+    toString (FieldSelectorError p t fs) = concat [
+        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)
-# (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
-
-splitEithers :: [Either a b] -> Either [a] [b]
-splitEithers [] = Right []
-splitEithers [Right x:xs] = splitEithers xs >>= \rest->Right [x:rest]
-splitEithers xs = Left $ [x\\(Left x)<-xs]
+sem (AST vd fd) = case runStateT m ('Map'.newMap, getRandomStream 1) of
+    Left e = Left [e]
+    Right ((vds, fds), gamma) = Right ((AST vds fds), gamma)
+where 
+    m :: Env ([VarDecl], [FunDecl])
+    m = (mapM semVarDecl vd) >>= \vds -> 
+        mapM semFunDecl fd >>= \fds -> 
+        pure (vds, fds)
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl f = pure $ Right f
+semFunDecl fd=:(FunDecl p f _ mt vds stmts) = 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 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
-//
-//typeExpr :: Expr -> Env Type
-//typeExpr (IntExpr _ _) = Right $ pure IntType
-//typeExpr (CharExpr _ _) = Right $ pure CharType
-//typeExpr (BoolExpr _ _) = Right $ pure BoolType
-//typeExpr (Op1Expr p UnNegation expr) = undef//typeExpr expr 
-////	>>= \exprtype->case exprtype of
-////		Right BoolType = Right $ pure BoolType
-////		t = Left $ UnifyError p BoolType exprtype
-//typeExpr (Op1Expr p UnMinus expr) = undef// typeExpr expr 
-////	>>= \exprtype->case exprtype of
-////		IntType = Right $ pure IntType
-////		t = Left $ UnifyError p IntType exprtype
-//// typeExpr (Op2Expr Pos Expr Op2 Expr) = undef
-////typeExpr (FunExpr Pos FunCall
-////typeExpr (EmptyListExpr Pos 
-////typeExpr (TupleExpr Pos (Expr, Expr)
-////typeExpr (VarExpr Pos VarDef) = undef
-////
-//class unify a :: Type a -> Env a
-//
-//instance unify Type where
-//	unify IntType IntType = Right $ pure IntType
-//	unify BoolType BoolType = Right $ pure BoolType
-//	unify CharType CharType = Right $ pure 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
-//
-//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
+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 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 
+    >>= \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) = 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 (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 = let t = IdType f in putIdent f t >>| pure t
+        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
+
+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
+
+instance unify [FieldSelector] where
+    unify t [] = pure t
+    unify (ListType t) [FieldHd:fs] = unify t fs
+    unify t=:(ListType _) [FieldTl:fs] = unify t fs
+    unify (TupleType (t, _)) [FieldFst:fs] = unify t fs
+    unify (TupleType (_, t)) [FieldSnd:fs] = unify t fs
+    unify t [fs:_] = liftT $ Left $ FieldSelectorError zero t fs
+
+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
+    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
+        Right t = Right t //note, t :: (Type, Gamma) 
+    where m = typeExpr e >>= \tex-> unify t tex 
+
+replace :: String Type -> Env Void
+replace ident type = get >>= \(st, fr)->put ('Map'.fromList $ 
+		map (itupdate ident type) ('Map'.toList st), fr)
+	where
+		itupdate :: String Type (String, Type) -> (String, Type)
+		itupdate ident newtype ov=:(key, IdType type) = if (ident == type)
+			(key, newtype) ov
+		itupdate ident newtype (key, TupleType (t1, t2))
+		# (_, t1) = itupdate ident newtype (key, t1)
+		# (_, t2) = itupdate ident newtype (key, t2)
+		= (key, TupleType (t1, t2))
+		itupdate ident newtype (key, ListType t1)
+		# (_, t1) = itupdate ident newtype (key, t1)
+		= (key, ListType t1)
+		itupdate _ _ k = k
+
+instance unify Type where
+	unify IntType IntType = pure IntType
+	unify BoolType BoolType = pure BoolType
+	unify CharType CharType = pure CharType
+    unify (IdType i) t=:(IdType j) = replace i t >>| pure t
+    unify t (IdType i) = unify (IdType i) t
+    unify (IdType i) t = replace i t >>| pure t
+    unify (ListType t1) (ListType t2) = unify t1 t2 >>| (pure $ ListType t1)
+	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 (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs
+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
+
+instance toString Gamma where
+	toString (mp, _) = concat
+		[concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]
+
+
+// class free a :: a -> Env [a]