betere gamma

[cc1516.git] / sem.icl

diff --git a/sem.icl b/sem.icl
index 7132135..4038c0f 100644 (file)
--- a/sem.icl
+++ b/sem.icl
@@ -9,9 +9,11 @@ import Control.Applicative
 import Control.Monad
 import Control.Monad.State
 import Control.Monad.Identity
+import Math.Random
 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,17 +21,27 @@ from Text import class Text(concat), instance Text String
 import AST
 from parse import :: ParserOutput, :: Error
 
-:: Gamma :== 'Map'.Map String Type
+:: Gamma :== ('Map'.Map String Type, [String])
 :: Env a :== (State Gamma (Either SemError a))
 
 get = state $ \s -> (s,s)
 
+getRandomStream :: Int -> [String]
+getRandomStream i = genIdents $ filter (isAlpha o toChar) (genRandInt i)
+       where
+               genIdents r = let (ic, r) = splitAt 5 r in [toString ic: genIdents r]
+
+freshIdent :: Gamma -> (String, Gamma)
+freshIdent (st, [ident:rest]) = case 'Map'.get ident st of
+       Nothing = (ident, (st, rest))
+       _ = freshIdent (st, rest)
+
 putIdent :: String Type -> Env Void
-putIdent i t = gets ('Map'.get i) >>= \mt -> case mt of
-    Nothing = pure <$> modify ('Map'.put i t)
+putIdent i t = gets (\(st, r)->'Map'.get i st) >>= \mt -> case mt of
+    Nothing = pure <$> modify (\(st, r)->('Map'.put i t st, r))
     Just t2 = unify t t2 >>= \r -> case r of
         Left e  = pure $ Left e
-        Right t3 = pure <$> modify ('Map'.put i t3)
+        Right t3 = pure <$> modify (\(st, r)->('Map'.put i t3 st, r))
 
 instance toString SemError where
        toString (ParseError p e) = concat [
@@ -43,7 +55,7 @@ instance toString SemError where
 
 sem :: AST -> SemOutput
 sem (AST vd fd)
-# (eithervds, gamma) = runState (mapM semVarDecl vd) 'Map'.newMap
+# (eithervds, gamma) = runState (mapM semVarDecl vd) ('Map'.newMap, getRandomStream 0)
 # (eitherfds, gamma) = runState (mapM semFunDecl fd) gamma
 = case splitEithers eithervds of
        (Left errs) = Left $ errs ++ [x\\(Left x)<-eitherfds]
@@ -61,28 +73,43 @@ semFunDecl f = pure $ Right f
 
 semVarDecl :: VarDecl -> Env VarDecl
 semVarDecl vd=:(VarDecl pos type ident ex) = unify type ex
-       >>= \et->pure (
-               et >>= \t->pure $ VarDecl pos t ident ex)
-//Right v
-//     //TODO ident in de environment
-//     Right e = Right $ pure vd
-
-typeOp1 :: Pos Expr Type -> Env Type
-typeOp1 p expr rtype = unify rtype expr
+       >>= \et->case et of
+               Left err = pure $ Left err
+               Right t = putIdent ident t >>| pure (Right $ 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 (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 (Op2Expr Pos Expr Op2 Expr) = undef
+//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
 
@@ -93,6 +120,7 @@ instance unify Expr where
                        "Expression cannot be a Void type."
        unify (IdType _) e = pure $ Left $ ParseError (extrPos e)
                        "Expression cannot be an polymorf type."
+    unify VarType e = typeExpr e
        unify t e = typeExpr e
                >>= \eithertype->case eithertype of
                        Left e = pure $ Left e