X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=sem.icl;h=68b804d42939c49739bb662f0688ccd527740913;hb=483bcde4dbb75d1901cffad6cc2c45307b7e90a2;hp=34675d282d94c352db56e42bfdab771c35871f32;hpb=ad0d73c9a00ded40c77b87a82059980acfb5edaf;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 34675d2..68b804d 100644
--- a/sem.icl
+++ b/sem.icl
@@ -55,7 +55,7 @@ sem (AST fd) = case foldM (const $ hasNoDups fd) () fd
             		>>| hasMain fd
                     >>| evalStateT (type fd) (zero, variableStream) of
 	Left e = Left [e]
-    Right fds = Right (AST fds)
+    Right (_,fds) = Right (AST fds)
 where
 		hasNoDups :: [FunDecl] FunDecl -> Either SemError ()
 		hasNoDups fds (FunDecl p n _ _ _ _)
@@ -270,10 +270,13 @@ instance infer Stmt where
         pure (compose s3 $ compose s2 s1, subst s3 wht)
 
     AssStmt (VarDef k fs) e =
-        infer e >>= \(s1, et)->
-        applySubst s1 >>|
-        changeGamma (extend k (Forall [] et)) >>| //todo: fieldselectors
-        pure (s1, VoidType)
+        lookup k >>= \expected ->
+        infer e >>= \(s1, given)->
+        lift (unify expected given) >>= \s2->
+        let s = compose s2 s1 in
+        applySubst s >>|
+        changeGamma (extend k (Forall [] given)) >>| //todo: fieldselectors
+        pure (s, VoidType)
 
     FunStmt f es = undef //what is this? 
 
@@ -298,7 +301,7 @@ instance infer [a] | infer a where
 
 //the type class inferes the type of an AST element (VarDecl or FunDecl)
 //and adds it to the AST element
-class type a :: a -> Typing a
+class type a :: a -> Typing (Substitution, a)
 
 instance type VarDecl where
     type (VarDecl p expected k e) = 
@@ -312,31 +315,38 @@ instance type VarDecl where
         let vtype = subst (compose s2 s1) given in
         generalize vtype >>= \t ->
         changeGamma (extend k t) >>| 
-        pure (VarDecl p (Just vtype) k e)
+        pure (compose s2 s1, VarDecl p (Just vtype) k e)
 
 instance type FunDecl where
     type (FunDecl p f args expected vds stmts) = 
+        gamma >>= \outerScope-> //functions are infered in their own scopde
         introduce f >>|
         mapM introduce args >>= \argTs->
-        type vds >>= \tVds->
-        infer stmts >>= \(s1, result)->
-        let given = foldr (->>) result argTs in 
+        type vds >>= \(s1, tVds)->
+        applySubst s1 >>|
+        infer stmts >>= \(s2, result)->
         applySubst s1 >>|
+        let argTs_ = map (subst $ compose s2 s1) argTs in 
+        //abort (concat $ intersperse "\n" $ map toString argTs_) >>|
+        let given = foldr (->>) result argTs_ in 
         (case expected of
             Nothing = pure zero
             Just expected_ = lift (unify expected_ given))
-        >>= \s2 ->
-        let ftype = subst (compose s2 s1) given in
+        >>= \s3 ->
+        let ftype = subst (compose s3 $ compose s2 s1) given in
         generalize ftype >>= \t->
+        putGamma outerScope >>|
         changeGamma (extend f t) >>| 
-        pure (FunDecl p f args (Just ftype) tVds stmts)
-
-instance toString (Maybe a) | toString a where
-    toString Nothing = "Nothing"
-    toString (Just e) = concat ["Just ", toString e]
+        pure (compose s3 $ compose s2 s1, FunDecl p f args (Just ftype) tVds stmts)
 
 instance type [a] | type a where
-    type dcls = mapM type dcls
+    type []     = pure (zero, [])
+    type [v:vs] = 
+        type v >>= \(s1, v_)->
+        applySubst s1 >>|
+        type vs >>= \(s2, vs_)->
+        applySubst (compose s2 s1) >>|
+        pure (compose s2 s1, [v_:vs_])
 
 introduce :: String -> Typing Type
 introduce k = 
@@ -379,6 +389,10 @@ instance toString SemError where
     toString (Error e) = concat ["Unknown error during semantical",
         "analysis: ", e]
 
+instance toString (Maybe a) | toString a where
+    toString Nothing = "Nothing"
+    toString (Just e) = concat ["Just ", toString e]
+
 instance MonadTrans (StateT (Gamma, [TVar])) where
     liftT m = StateT \s-> m >>= \a-> return (a, s)