From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 13 Apr 2016 17:46:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/cc1516
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=2302fbd1f7421f6824879e64d904157acb9797b1;hp=eebf260cfb0f6fa5c97250dabd50e7b98281a381;p=cc1516.git

Merge branch 'master' of github.com:dopefishh/cc1516
---

diff --git a/examples/StmtEx.spl b/examples/StmtEx.spl
index 35ff096..d52e5b7 100644
--- a/examples/StmtEx.spl
+++ b/examples/StmtEx.spl
@@ -4,6 +4,7 @@ var z = 3 + y;
 Int a = facR(4);
 //Int b = test(3);
 var f = beep();
+var n = True;
 
 facR(n) :: Int -> Int {
     test(3);
@@ -15,11 +16,11 @@ facR(n) :: Int -> Int {
     return 5;
 }
 
-test(n) :: Int -> Int {
+test(n) :: Int -> Bool {
     var i = 0;
-    facR(2);
-    while (z < 3) {
-        return 3;
+    facR(z);
+    while (n < 3) {
+        return True;
     }
 }
 
diff --git a/sem.icl b/sem.icl
index 8dff548..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,14 +44,15 @@ where
         pure (vds, fds)
 
 semFunDecl :: FunDecl -> Env FunDecl
-semFunDecl fd=:(FunDecl p f args mt vds stmts) = (case mt of
-    Nothing = let t = IdType f in putIdent f t >>| pure t//typeFun f args
-    Just t = putIdent f t >>| pure t) >>= \ft ->
+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 >>| pure fd 
-    //case mt of 
-//    Nothing = let t = IdType f in putIdent f t >>| pure fd
-//    Just t = putIdent f t >>| pure fd
+    mapM_ (checkStmt $ resultType ft) stmts >>| 
+    restoreGamma gamma >>| pure fd 
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl (VarDecl pos type ident ex) = unify type ex
@@ -155,7 +105,7 @@ 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]")
 
@@ -233,3 +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
+
+restoreGamma :: Gamma -> Env Void
+restoreGamma g = put g
\ No newline at end of file