X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=utils%2Fext-core%2FPrep.hs;h=05250afdc8ebbf174f69792cc5cae441c0ecf062;hp=0a105c1b5229667cba1ef4292ad9cb6e69a286d4;hb=420a27dc9fb7de5fc6c96fe078ddd4dc87222d44;hpb=6b085eeada6c3c93599fa4b6d77572abc419c08c diff --git a/utils/ext-core/Prep.hs b/utils/ext-core/Prep.hs index 0a105c1..05250af 100644 --- a/utils/ext-core/Prep.hs +++ b/utils/ext-core/Prep.hs @@ -1,3 +1,4 @@ +{-# OPTIONS -Wall -fno-warn-name-shadowing #-} {- Preprocess a module to normalize it in the following ways: (1) Saturate all constructor and primop applications. @@ -10,14 +11,17 @@ After these preprocessing steps, Core can be interpreted (or given an operationa module Prep where +import Data.Either + import Prims import Core -import Printer import Env import Check +import Data.List + primArgTys :: Env Var [Ty] -primArgTys = efromlist (map f Prims.primVals) +primArgTys = efromlist (map f (etolist (venv_ primEnv))) where f (v,t) = (v,atys) where (_,atys,_) = splitTy t @@ -25,6 +29,7 @@ prepModule :: Menv -> Module -> Module prepModule globalEnv (Module mn tdefs vdefgs) = Module mn tdefs vdefgs' where + (_,vdefgs') = foldl prepTopVdefg (eempty,[]) vdefgs prepTopVdefg (venv,vdefgs) vdefg = (venv',vdefgs ++ [vdefg']) @@ -32,35 +37,36 @@ prepModule globalEnv (Module mn tdefs vdefgs) = prepVdefg (env@(venv,_)) (Nonrec(Vdef((Nothing,x),t,e))) = (eextend venv (x,t), Nonrec(Vdef((Nothing,x),t,prepExp env e))) - prepVdefg (env@(venv,_)) (Nonrec(Vdef(qx,t,e))) = - (venv, Nonrec(Vdef(qx,t,prepExp env e))) + prepVdefg (env@(venv,_)) (Nonrec(Vdef(qx,t,e))) = + (venv, Nonrec(Vdef(qx,t,prepExp env e))) prepVdefg (venv,tvenv) (Rec vdefs) = - (venv',Rec [Vdef(qx,t,prepExp (venv',tvenv) e) | Vdef(qx,t,e) <- vdefs]) + (venv',Rec [ Vdef(qx,t,prepExp (venv',tvenv) e) | Vdef(qx,t,e) <- vdefs]) where venv' = foldl eextend venv [(x,t) | Vdef((Nothing,x),t,_) <- vdefs] - prepExp env (Var qv) = Var qv - prepExp env (Dcon qdc) = Dcon qdc - prepExp env (Lit l) = Lit l + prepExp _ (Var qv) = Var qv + prepExp _ (Dcon qdc) = Dcon qdc + prepExp _ (Lit l) = Lit l prepExp env e@(App _ _) = unwindApp env e [] prepExp env e@(Appt _ _) = unwindApp env e [] prepExp (venv,tvenv) (Lam (Vb vb) e) = Lam (Vb vb) (prepExp (eextend venv vb,tvenv) e) prepExp (venv,tvenv) (Lam (Tb tb) e) = Lam (Tb tb) (prepExp (venv,eextend tvenv tb) e) prepExp env@(venv,tvenv) (Let (Nonrec(Vdef((Nothing,x),t,b))) e) - | kindof tvenv t == Kunlifted && suspends b = + | (kindOfTy tvenv t `eqKind` Kunlifted && suspends b) = -- There are two places where we call the typechecker, one of them -- here. -- We need to know the type of the let body in order to construct -- a case expression. - let eTy = typeOfExp env e in - Case (prepExp env b) (x,t) + -- need to extend the env with the let-bound var too! + let eTy = typeOfExp (eextend venv (x, t), tvenv) e in + Case (prepExp env b) (x,t) eTy - [Adefault (prepExp (eextend venv (x,t),tvenv) e)] + [Adefault (prepExp (eextend venv (x,t),tvenv) e)] prepExp (venv,tvenv) (Let vdefg e) = Let vdefg' (prepExp (venv',tvenv) e) where (venv',vdefg') = prepVdefg (venv,tvenv) vdefg prepExp env@(venv,tvenv) (Case e vb t alts) = Case (prepExp env e) vb t (map (prepAlt (eextend venv vb,tvenv)) alts) prepExp env (Cast e t) = Cast (prepExp env e) t prepExp env (Note s e) = Note s (prepExp env e) - prepExp env (External s t) = External s t + prepExp _ (External s t) = External s t prepAlt (venv,tvenv) (Acon qdc tbs vbs e) = Acon qdc tbs vbs (prepExp (foldl eextend venv vbs,foldl eextend tvenv tbs) e) prepAlt env (Alit l e) = Alit l (prepExp env e) @@ -69,7 +75,7 @@ prepModule globalEnv (Module mn tdefs vdefgs) = unwindApp env (App e1 e2) as = unwindApp env e1 (Left e2:as) unwindApp env (Appt e t) as = unwindApp env e (Right t:as) - unwindApp env (op@(Dcon qdc)) as = + unwindApp env (op@(Dcon qdc)) as = etaExpand (drop n atys) (rewindApp env op as) where (tbs,atys0,_) = splitTy (qlookup cenv_ eempty qdc) atys = map (substl (map fst tbs) ts) atys0 @@ -82,25 +88,40 @@ prepModule globalEnv (Module mn tdefs vdefgs) = unwindApp env op as = rewindApp env op as - etaExpand ts e = foldl g e [('$':(show i),t) | (i,t) <- zip [1..] ts] - where g e (v,t) = Lam (Vb(v,t)) (App e (Var (unqual v))) + etaExpand :: [Ty] -> Exp -> Exp + etaExpand ts e = + let args = [('$':(show i),t) | (i,t) <- zip [(1::Integer)..] ts] in + foldr (\ (v,t) e -> Lam (Vb (v,t)) e) + (foldl (\ e (v,_) -> App e (Var (unqual v))) e args) + args - rewindApp env e [] = e - rewindApp env@(venv,tvenv) e1 (Left e2:as) | kindof tvenv t == Kunlifted && suspends e2 = + rewindApp _ e [] = e + rewindApp env@(venv,tvenv) e1 (Left e2:as) | kindOfTy tvenv t `eqKind` Kunlifted && suspends e2 = -- This is the other place where we call the typechecker. - Case (prepExp env' e2) (v,t) (typeOfExp env rhs) [Adefault rhs] - where rhs = (rewindApp env' (App e1 (Var (unqual v))) as) - v = freshVar venv + Case newScrut (v,t) (typeOfExp env' rhs) [Adefault rhs] + where newScrut = prepExp env e2 + rhs = (rewindApp env' (App e1 (Var (unqual v))) as) + -- note: + -- e1 gets moved inside rhs. so if we pick a case + -- var name (outside e1) equal to a name bound *inside* + -- e1, the binding *inside* e1 will shadow "v" + -- Which would be name capture! + -- So, we pass the bound vars of e1 to freshVar along with + -- the domain of the current env. + v = freshVar (edomain venv `union` (boundVars e1)) t = typeOfExp env e2 env' = (eextend venv (v,t),tvenv) rewindApp env e1 (Left e2:as) = rewindApp env (App e1 (prepExp env e2)) as rewindApp env e (Right t:as) = rewindApp env (Appt e t) as - freshVar venv = maximum ("":edomain venv) ++ "x" -- one simple way! + freshVar vs = maximum ("":vs) ++ "x" -- one simple way! typeOfExp :: (Venv, Tvenv) -> Exp -> Ty typeOfExp = uncurry (checkExpr mn globalEnv tdefs) + kindOfTy :: Tvenv -> Ty -> Kind + kindOfTy tvenv = checkType mn globalEnv tdefs tvenv + {- Return false for those expressions for which Interp.suspendExp builds a thunk. -} suspends (Var _) = False suspends (Lit _) = False @@ -112,16 +133,6 @@ prepModule globalEnv (Module mn tdefs vdefgs) = suspends (External _ _) = False suspends _ = True - kindof :: Tvenv -> Ty -> Kind - kindof tvenv (Tvar tv) = - case elookup tvenv tv of - Just k -> k - Nothing -> error ("impossible Tyvar " ++ show tv) - kindof tvenv (Tcon qtc) = qlookup tcenv_ eempty qtc - kindof tvenv (Tapp t1 t2) = k2 - where Karrow _ k2 = kindof tvenv t1 - kindof tvenv (Tforall _ t) = kindof tvenv t - mlookup :: (Envs -> Env a b) -> Env a b -> Mname -> Env a b mlookup _ local_env Nothing = local_env mlookup selector _ (Just m) = @@ -135,3 +146,29 @@ prepModule globalEnv (Module mn tdefs vdefgs) = Just v -> v Nothing -> error ("undefined identifier: " ++ show k) +boundVars :: Exp -> [Id] +boundVars (Lam (Vb (v,_)) e) = [v] `union` boundVars e +boundVars (Lam _ e) = boundVars e +boundVars (Let vds e) = (boundVarsVdefs vds) `union` boundVars e +boundVars (Case scrut (v,_) _ alts) = + [v] `union` (boundVars scrut) `union` boundVarsAlts alts +boundVars (Cast e _) = boundVars e +boundVars (Note _ e) = boundVars e +boundVars (App e1 e2) = boundVars e1 `union` boundVars e2 +boundVars (Appt e _) = boundVars e +boundVars _ = [] + +boundVarsVdefs :: Vdefg -> [Id] +boundVarsVdefs (Rec vds) = nub (concatMap boundVarsVdef vds) +boundVarsVdefs (Nonrec vd) = boundVarsVdef vd + +boundVarsVdef :: Vdef -> [Id] +boundVarsVdef (Vdef ((_,v),_,e)) = [v] `union` boundVars e + +boundVarsAlts :: [Alt] -> [Var] +boundVarsAlts as = nub (concatMap boundVarsAlt as) + +boundVarsAlt :: Alt -> [Var] +boundVarsAlt (Acon _ _ vbs e) = (map fst vbs) `union` (boundVars e) +boundVarsAlt (Alit _ e) = boundVars e +boundVarsAlt (Adefault e) = boundVars e \ No newline at end of file