From: Mart Lubbers Date: Tue, 12 Apr 2016 20:21:07 +0000 (+0200) Subject: betere gamma X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=6e5d435a99f84ad4f4f7cb4f6a41c28b79c29ab3;p=cc1516.git betere gamma --- diff --git a/sem.icl b/sem.icl index 31221ca..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,24 +21,33 @@ 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 [ toString p,"SemError: ParseError: ", e] toString (Error e) = "SemError: " +++ e - toString (UnifyErrorStub t1 t2) = toString (UnifyError {line=0,col=0} t1 -t2) + 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: ", @@ -44,7 +55,7 @@ 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] @@ -82,7 +93,7 @@ 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) = +typeExpr (Op2Expr p e1 BiEquals e2) = undef typeExpr (Op2Expr p e1 BiUnEqual e2) = undef //char of int typeExpr (Op2Expr p e1 BiLesser e2) = undef