X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=sem.icl;h=4038c0face098446954d8fba712fbec949bd56bb;hb=6e5d435a99f84ad4f4f7cb4f6a41c28b79c29ab3;hp=4a3fbe59ec8dadf8f15878f924406bccede18e6c;hpb=ae679fa9a2d32f0d4037f689398bad77d5dd1b78;p=cc1516.git

diff --git a/sem.icl b/sem.icl
index 4a3fbe5..4038c0f 100644
--- 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,52 +21,41 @@ from Text import class Text(concat), instance Text String
 import AST
 from parse import :: ParserOutput, :: Error
 
-:: Gamma :== 'Map'.Map String Type
-:: Env a = Env (State Gamma (Either SemError a))
-
-instance Functor Env where
-    fmap f m = liftM f m
-
-instance Applicative Env where
-    (<*>) f g   = ap f g
-    pure  a     = Env $ pure $ Right a
-
-instance Alternative Env where
-    empty       = Env $ pure $ Left (Error "Undefined error")
-    (<|>) f g   = f >>= \ef -> g >>= \eg -> Env $ pure $ (ef <|> eg) //case ef of 
-        //Left e  = eg
-        //Right r = Right r
-
-instance Monad Env where
-    bind e f    = e >>= \ee -> Env $ pure $ case ee of
-        (Left e) = Left e
-        (Right r) = f r
+:: Gamma :== ('Map'.Map String Type, [String])
+:: Env a :== (State Gamma (Either SemError a))
 
 get = state $ \s -> (s,s)
 
-instance toString SemError where
-    toString (ParseError p e) = concat [
-        toString p,"SemError: ParseError: ", e]
-    toString (Error e) = "SemError: " +++ e
-    toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1 t2)
-    toString (UnifyError p t1 t2) = concat [
-        toString p,
-        "SemError: Cannot unify types. Expected: ",
-        toString t1, ". Given: ", toString t2]
+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)
 
-sem :: AST -> SemOutput
-sem x = undef
-/*
 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 [
+		toString p,"SemError: ParseError: ", e]
+	toString (Error e) = "SemError: " +++ e
+	toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1 t2)
+	toString (UnifyError p t1 t2) = concat [
+		toString p,
+		"SemError: Cannot unify types. Expected: ",
+		toString t1, ". Given: ", toString t2]
 
 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]
@@ -116,7 +107,8 @@ typeExpr (Op2Expr p e1 BiOr e2) = undef
 typeExpr (Op2Expr p e1 BiCons e2) = undef
 //typeExpr (FunExpr Pos FunCall) = undef
 //typeExpr (EmptyListExpr Pos) = undef
-//typeExpr (VarExpr Pos VarDef) = undef //when checking var-expr, be sure to put the infered type
+//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
@@ -160,4 +152,3 @@ extrPos (BoolExpr p _) = p
 extrPos (FunExpr p _) = p
 extrPos (EmptyListExpr p) = p
 extrPos (TupleExpr p _) = p
-*/
\ No newline at end of file