X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=addadad6c3f33fdd3bcc0255d3d582ea0c75f1b5;hb=2302fbd1f7421f6824879e64d904157acb9797b1;hp=ffe95dd2de37f9ee6af677525ebabb9204500c18;hpb=3bf5967ddf63e4d616d7ffd905151a1cbd71eeef;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index ffe95dd..addadad 100644
--- a/sem.icl
+++ b/sem.icl
@@ -33,57 +33,6 @@ instance MonadTrans (StateT Gamma) where
 
 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))
-
-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 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]
-    toString (FieldSelectorError p t fs) = concat [
-        toString p,
-        "SemError: Cannot select ", toString fs, " from type: ",
-        toString t]
-	toString (OperatorError p o t) = concat [
-		toString p, 
-		"SemError: No ", toString o, " for 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
     Left e = Left [e]
@@ -95,11 +44,15 @@ where
         pure (vds, fds)
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl fd=:(FunDecl p f _ mt vds stmts) = mapM_ semVarDecl vds >>| 
-    mapM_ (checkStmt IntType) stmts >>| 
-    case mt of 
-    Nothing = let t = IdType f in putIdent f t >>| pure fd
-    Just t = putIdent f t >>| pure fd
+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
+        Just t = putIdent f t >>| pure t) >>= \ft ->
+    mapM_ (\a-> putIdent a (IdType <$> freshIdent)) args >>|
+    mapM_ semVarDecl vds >>| 
+    mapM_ (checkStmt $ resultType ft) stmts >>| 
+    restoreGamma gamma >>| pure fd 
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl (VarDecl pos type ident ex) = unify type ex
@@ -111,13 +64,10 @@ checkStmt t (IfStmt c st se) = unify BoolType c >>| mapM (checkStmt t) st
 checkStmt t w=:(WhileStmt c et) = unify BoolType c >>| mapM (checkStmt t) et
     >>= \et1-> pure w
 checkStmt t (AssStmt (VarDef ident fs) e) = undef
-checkStmt t r=:(FunStmt funcall) = typeFun funcall >>| pure r
+checkStmt t r=:(FunStmt (FunCall f es)) = typeFun f es >>| pure r
 checkStmt VoidType r=:(ReturnStmt Nothing) = pure r
 checkStmt t r=:(ReturnStmt (Just e)) = unify t e >>| pure r
 
-all :: [Bool] -> Bool
-all as = foldr (&&) True as
-
 typeExpr :: Expr -> Env Type
 typeExpr (IntExpr _ _) = pure IntType
 typeExpr (CharExpr _ _) = pure CharType
@@ -139,7 +89,7 @@ typeExpr (Op2Expr p e1 op 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) = typeFun funcall
+typeExpr (FunExpr p (FunCall f es)) = typeFun f es
 typeExpr (VarExpr p (VarDef ident fs)) = gets (\(st, r)->'Map'.get ident st)
     >>= \mt->case mt of
         Nothing = liftT $ Left $ UndeclaredVariableError p ident
@@ -155,10 +105,20 @@ 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 t [] = pure t
 unifyApp (tf1 ->> tf2) [t1:ts] = unify tf1 t1 >>| unifyApp tf2 ts
 unifyApp t1 t2 = liftT $ Left $ UnifyError zero t1 (IdType "[expressions, FIXME]")
 
+typeFun :: String [Expr] -> Env Type
+typeFun 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
+
+resultType :: Type -> Type
+resultType (_ ->> t) = resultType t
+resultType t = t
+
 class unify a :: Type a -> Env Type
 
 instance unify [FieldSelector] where
@@ -198,12 +158,6 @@ instance unify Type where
 instance zero Pos where
 	zero = {line=0,col=0}
 
-typeFun :: FunCall -> Env Type
-typeFun (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
-
 decErr :: Expr SemError -> SemError
 decErr e (UnifyError _ t1 t2) = UnifyError (extrPos e) t1 t2
 decErr e (FieldSelectorError _ t fs) = FieldSelectorError (extrPos e) t fs
@@ -229,5 +183,59 @@ instance toString Gamma where
 	toString (mp, _) = concat
 		[concat [k, ": ", toString v, "\n"]\\(k, v) <- 'Map'.toList mp]
 
+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))
+
+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 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]
+    toString (FieldSelectorError p t fs) = concat [
+        toString p,
+        "SemError: Cannot select ", toString fs, " from type: ",
+        toString t]
+    toString (OperatorError p o t) = concat [
+        toString p, 
+        "SemError: No ", toString o, " for type ",
+        toString t]
+    toString (UndeclaredVariableError p ident) = concat [
+        toString p, "SemError: identifier: ", ident, " undefined."]
+
+saveGamma :: Env Gamma
+saveGamma = get
 
-// class free a :: a -> Env [a]
+restoreGamma :: Gamma -> Env Void
+restoreGamma g = put g
\ No newline at end of file