X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FMkExternalCore.lhs;h=9b9ca5e7c90bf90b80958de13f91a407f4fd13d0;hp=337b21a8f0ff09c5fad947879e40c32ca37c723b;hb=d2ce0f52d42edf32bb9f13796e6ba6edba8bd516;hpb=4c6a3f787abcaed009a574196d82237d9ae64fc8 diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs index 337b21a..9b9ca5e 100644 --- a/compiler/coreSyn/MkExternalCore.lhs +++ b/compiler/coreSyn/MkExternalCore.lhs @@ -26,15 +26,14 @@ import Outputable import Encoding import ForeignCall import DynFlags -import StaticFlags import FastString -import IO import Data.Char +import System.IO emitExternalCore :: DynFlags -> CgGuts -> IO () emitExternalCore dflags cg_guts - | opt_EmitExternalCore + | dopt Opt_EmitExternalCore dflags = (do handle <- openFile corename WriteMode hPutStrLn handle (show (mkExternalCore cg_guts)) hClose handle) @@ -63,9 +62,11 @@ mkExternalCore :: CgGuts -> C.Module -- not been injected, so we have to add them manually here -- We don't include the strange data-con *workers* because they are -- implicit in the data type declaration itself -mkExternalCore (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds}) - = (C.Module mname tdefs (runCoreM (mapM (make_vdef True) binds) - this_mod)) +mkExternalCore (CgGuts {cg_module=this_mod, cg_tycons = tycons, + cg_binds = binds}) +{- Note that modules can be mutually recursive, but even so, we + print out dependency information within each module. -} + = C.Module mname tdefs (runCoreM (mapM (make_vdef True) binds) this_mod) where mname = make_mid this_mod tdefs = foldr collect_tdefs [] tycons @@ -75,29 +76,17 @@ collect_tdefs tcon tdefs | isAlgTyCon tcon = tdef: tdefs where tdef | isNewTyCon tcon = - C.Newtype (qtc tcon) (map make_tbind tyvars) + C.Newtype (qtc tcon) (case newTyConCo_maybe tcon of - Just co -> (qtc co, - map make_tbind vs, - make_kind (mkCoKind l r)) - where (vs,l,r) = coercionAxiom co + Just co -> qtc co Nothing -> pprPanic ("MkExternalCore: newtype tcon\ should have a coercion: ") (ppr tcon)) - repclause + (map make_tbind tyvars) + (make_ty (snd (newTyConRhs tcon))) | otherwise = C.Data (qtc tcon) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) - where repclause | isRecursiveTyCon tcon || isOpenTyCon tcon= Nothing - | otherwise = Just (make_ty (snd (newTyConRhs tcon))) tyvars = tyConTyVars tcon - coercionAxiom co = - case isCoercionTyCon_maybe co of - -- See Note [Newtype coercions] in - -- types/TyCon - Just (arity,coKindFun) | (l,r) <- (coKindFun $ map mkTyVarTy vs) -> - (vs,l,r) where vs = take arity tyvars - Nothing -> pprPanic "MkExternalCore: coercion tcon lacks a kind fun" - (ppr tcon) collect_tdefs _ tdefs = tdefs @@ -117,7 +106,7 @@ make_tbind :: TyVar -> C.Tbind make_tbind tv = (make_var_id (tyVarName tv), make_kind (tyVarKind tv)) make_vbind :: Var -> C.Vbind -make_vbind v = (make_var_id (Var.varName v), make_ty (idType v)) +make_vbind v = (make_var_id (Var.varName v), make_ty (varType v)) make_vdef :: Bool -> CoreBind -> CoreM C.Vdefg make_vdef topLevel b = @@ -131,7 +120,7 @@ make_vdef topLevel b = let local = not topLevel || localN rhs <- make_exp e -- use local flag to determine where to add the module name - return (local, make_qid local True vName, make_ty (idType v),rhs) + return (local, make_qid local True vName, make_ty (varType v),rhs) where vName = Var.varName v make_exp :: CoreExpr -> CoreM C.Exp @@ -139,27 +128,24 @@ make_exp (Var v) = do let vName = Var.varName v isLocal <- isALocal vName return $ - case globalIdDetails v of - FCallId (CCall (CCallSpec (StaticTarget nm) callconv _)) - -> C.External (unpackFS nm) (showSDoc (ppr callconv)) (make_ty (idType v)) + case idDetails v of + FCallId (CCall (CCallSpec (StaticTarget nm _) callconv _)) + -> C.External (unpackFS nm) (showSDoc (ppr callconv)) (make_ty (varType v)) FCallId (CCall (CCallSpec DynamicTarget callconv _)) - -> C.DynExternal (showSDoc (ppr callconv)) (make_ty (idType v)) - FCallId _ - -> pprPanic "MkExternalCore died: can't handle non-{static,dynamic}-C foreign call" - (ppr v) + -> C.DynExternal (showSDoc (ppr callconv)) (make_ty (varType v)) -- Constructors are always exported, so make sure to declare them -- with qualified names DataConWorkId _ -> C.Var (make_var_qid False vName) DataConWrapId _ -> C.Var (make_var_qid False vName) _ -> C.Var (make_var_qid isLocal vName) -make_exp (Lit (MachLabel s _)) = return $ C.Label (unpackFS s) +make_exp (Lit (MachLabel s _ _)) = return $ C.Label (unpackFS s) make_exp (Lit l) = return $ C.Lit (make_lit l) make_exp (App e (Type t)) = make_exp e >>= (\ b -> return $ C.Appt b (make_ty t)) make_exp (App e1 e2) = do rator <- make_exp e1 rand <- make_exp e2 return $ C.App rator rand -make_exp (Lam v e) | isTyVar v = make_exp e >>= (\ b -> +make_exp (Lam v e) | isTyCoVar v = make_exp e >>= (\ b -> return $ C.Lam (C.Tb (make_tbind v)) b) make_exp (Lam v e) | otherwise = make_exp e >>= (\ b -> return $ C.Lam (C.Vb (make_vbind v)) b) @@ -174,7 +160,6 @@ make_exp (Case e v ty alts) = do return $ C.Case scrut (make_vbind v) (make_ty ty) newAlts make_exp (Note (SCC _) e) = make_exp e >>= (return . C.Note "SCC") -- temporary make_exp (Note (CoreNote s) e) = make_exp e >>= (return . C.Note s) -- hdaume: core annotations -make_exp (Note InlineMe e) = make_exp e >>= (return . C.Note "InlineMe") make_exp _ = error "MkExternalCore died: make_exp" make_alt :: CoreAlt -> CoreM C.Alt @@ -184,7 +169,7 @@ make_alt (DataAlt dcon, vs, e) = do (map make_tbind tbs) (map make_vbind vbs) newE - where (tbs,vbs) = span isTyVar vs + where (tbs,vbs) = span isTyCoVar vs make_alt (LitAlt l,_,e) = make_exp e >>= (return . (C.Alit (make_lit l))) make_alt (DEFAULT,[],e) = make_exp e >>= (return . C.Adefault) -- This should never happen, as the DEFAULT alternative binds no variables, @@ -226,8 +211,8 @@ make_ty' (TyVarTy tv) = C.Tvar (make_var_id (tyVarName tv)) make_ty' (AppTy t1 t2) = C.Tapp (make_ty t1) (make_ty t2) make_ty' (FunTy t1 t2) = make_ty (TyConApp funTyCon [t1,t2]) make_ty' (ForAllTy tv t) = C.Tforall (make_tbind tv) (make_ty t) -make_ty' (TyConApp tc ts) = foldl C.Tapp (C.Tcon (qtc tc)) - (map make_ty ts) +make_ty' (TyConApp tc ts) = make_tyConApp tc ts + -- Newtypes are treated just like any other type constructor; not expanded -- Reason: predTypeRep does substitution and, while substitution deals -- correctly with name capture, it's only correct if you see the uniques! @@ -242,6 +227,25 @@ make_ty' (TyConApp tc ts) = foldl C.Tapp (C.Tcon (qtc tc)) make_ty' (PredTy p) = make_ty (predTypeRep p) +make_tyConApp :: TyCon -> [Type] -> C.Ty +make_tyConApp tc [t1, t2] | tc == transCoercionTyCon = + C.TransCoercion (make_ty t1) (make_ty t2) +make_tyConApp tc [t] | tc == symCoercionTyCon = + C.SymCoercion (make_ty t) +make_tyConApp tc [t1, t2] | tc == unsafeCoercionTyCon = + C.UnsafeCoercion (make_ty t1) (make_ty t2) +make_tyConApp tc [t] | tc == leftCoercionTyCon = + C.LeftCoercion (make_ty t) +make_tyConApp tc [t] | tc == rightCoercionTyCon = + C.RightCoercion (make_ty t) +make_tyConApp tc [t1, t2] | tc == instCoercionTyCon = + C.InstCoercion (make_ty t1) (make_ty t2) +-- this fails silently if we have an application +-- of a wired-in coercion tycon to the wrong number of args. +-- Not great... +make_tyConApp tc ts = + foldl C.Tapp (C.Tcon (qtc tc)) + (map make_ty ts) make_kind :: Kind -> C.Kind @@ -257,7 +261,9 @@ make_kind _ = error "MkExternalCore died: make_kind" {- Id generation. -} make_id :: Bool -> Name -> C.Id -make_id _is_var nm = (occNameString . nameOccName) nm +-- include uniques for internal names in order to avoid name shadowing +make_id _is_var nm = ((occNameString . nameOccName) nm) + ++ (if isInternalName nm then (show . nameUnique) nm else "") make_var_id :: Name -> C.Id make_var_id = make_id True