X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcoreSyn%2FMkExternalCore.lhs;h=291b16e823eb0770bd3ac63fdf3374cd2ba40687;hb=876b4ef2093cb9c104db33c7db1200b941b6d079;hp=8ad5c7f1850c34400c72bca61bfb6b85c7630f99;hpb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;p=ghc-hetmet.git diff --git a/ghc/compiler/coreSyn/MkExternalCore.lhs b/ghc/compiler/coreSyn/MkExternalCore.lhs index 8ad5c7f..291b16e 100644 --- a/ghc/compiler/coreSyn/MkExternalCore.lhs +++ b/ghc/compiler/coreSyn/MkExternalCore.lhs @@ -15,32 +15,29 @@ import Module import CoreSyn import HscTypes import TyCon -import Class import TypeRep import Type import PprExternalCore -- Instances -import DataCon ( DataCon, dataConExistentialTyVars, dataConRepArgTys, - dataConName, dataConWrapId_maybe ) +import DataCon ( DataCon, dataConTyVars, dataConRepArgTys, + dataConName, dataConTyCon ) import CoreSyn import Var import IdInfo -import Id ( idUnfolding ) -import CoreTidy ( tidyExpr ) -import VarEnv ( emptyTidyEnv ) +import Kind import Literal import Name import Outputable import ForeignCall -import CmdLineOpts -import Maybes ( mapCatMaybes ) +import DynFlags ( DynFlags(..) ) +import StaticFlags ( opt_EmitExternalCore ) import IO import FastString -emitExternalCore :: DynFlags -> ModGuts -> IO () -emitExternalCore dflags mod_impl +emitExternalCore :: DynFlags -> CgGuts -> IO () +emitExternalCore dflags cg_guts | opt_EmitExternalCore = (do handle <- openFile corename WriteMode - hPutStrLn handle (show (mkExternalCore mod_impl)) + hPutStrLn handle (show (mkExternalCore cg_guts)) hClose handle) `catch` (\err -> pprPanic "Failed to open or write external core output file" (text corename)) @@ -50,45 +47,17 @@ emitExternalCore _ _ = return () -mkExternalCore :: ModGuts -> C.Module +mkExternalCore :: CgGuts -> C.Module -- The ModGuts has been tidied, but the implicit bindings have -- 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 (ModGuts {mg_module=this_mod, mg_types = type_env, mg_binds = binds}) - = C.Module mname tdefs (map make_vdef all_binds) +mkExternalCore (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds}) + = C.Module mname tdefs (map make_vdef binds) where mname = make_mid this_mod tdefs = foldr collect_tdefs [] tycons - all_binds = implicit_con_wrappers ++ other_implicit_binds ++ binds - -- Put the constructor wrappers first, because - -- other implicit bindings (notably the fromT functions arising - -- from generics) use the constructor wrappers. - - tycons = map classTyCon (typeEnvClasses type_env) ++ typeEnvTyCons type_env - - implicit_con_wrappers = map get_defn (concatMap implicit_con_ids (typeEnvElts type_env)) - other_implicit_binds = map get_defn (concatMap other_implicit_ids (typeEnvElts type_env)) - -implicit_con_ids :: TyThing -> [Id] -implicit_con_ids (ATyCon tc) | isAlgTyCon tc = mapCatMaybes dataConWrapId_maybe (tyConDataCons tc) -implicit_con_ids other = [] - -other_implicit_ids :: TyThing -> [Id] -other_implicit_ids (ATyCon tc) = tyConSelIds tc -other_implicit_ids (AClass cl) = classSelIds cl -other_implicit_ids other = [] - -get_defn :: Id -> CoreBind -get_defn id = NonRec id rhs - where - rhs = tidyExpr emptyTidyEnv body - body = unfoldingTemplate (idUnfolding id) - -- Don't forget to tidy the body ! Otherwise you get silly things like - -- \ tpl -> case tpl of tpl -> (tpl,tpl) -> tpl - -- Maybe we should inject these bindings during CoreTidy? - collect_tdefs :: TyCon -> [C.Tdef] -> [C.Tdef] collect_tdefs tcon tdefs | isAlgTyCon tcon = tdef: tdefs @@ -111,21 +80,21 @@ make_cdef dcon = C.Constr dcon_name existentials tys where dcon_name = make_var_id (dataConName dcon) existentials = map make_tbind ex_tyvars - ex_tyvars = dataConExistentialTyVars dcon + ex_tyvars = drop (tyConArity (dataConTyCon dcon)) (dataConTyVars dcon) tys = map make_ty (dataConRepArgTys dcon) 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 (varType v)) +make_vbind v = (make_var_id (Var.varName v), make_ty (idType v)) make_vdef :: CoreBind -> C.Vdefg make_vdef b = case b of NonRec v e -> C.Nonrec (f (v,e)) Rec ves -> C.Rec (map f ves) - where f (v,e) = (make_var_id (Var.varName v), make_ty (varType v),make_exp e) + where f (v,e) = (make_var_id (Var.varName v), make_ty (idType v),make_exp e) -- Top level bindings are unqualified now make_exp :: CoreExpr -> C.Exp @@ -133,7 +102,7 @@ make_exp (Var v) = case globalIdDetails v of -- a DataConId represents the Id of a worker, which is a varName. -- sof 4/02 -- DataConId _ -> C.Dcon (make_con_qid (Var.varName v)) - FCallId (CCall (CCallSpec (StaticTarget nm) _ _)) -> C.External (unpackFS nm) (make_ty (varType v)) + FCallId (CCall (CCallSpec (StaticTarget nm) _ _)) -> C.External (unpackFS nm) (make_ty (idType v)) FCallId _ -> error "MkExternalCore died: can't handle non-static-C foreign call" _ -> C.Var (make_var_qid (Var.varName v)) make_exp (Lit (l@(MachLabel s _))) = error "MkExternalCore died: can't handle \"foreign label\" declarations" @@ -143,7 +112,8 @@ make_exp (App e1 e2) = C.App (make_exp e1) (make_exp e2) make_exp (Lam v e) | isTyVar v = C.Lam (C.Tb (make_tbind v)) (make_exp e) make_exp (Lam v e) | otherwise = C.Lam (C.Vb (make_vbind v)) (make_exp e) make_exp (Let b e) = C.Let (make_vdef b) (make_exp e) -make_exp (Case e v alts) = C.Case (make_exp e) (make_vbind v) (map make_alt alts) +-- gaw 2004 +make_exp (Case e v ty alts) = C.Case (make_exp e) (make_vbind v) (make_ty ty) (map make_alt alts) make_exp (Note (SCC cc) e) = C.Note "SCC" (make_exp e) -- temporary make_exp (Note (Coerce t_to t_from) e) = C.Coerce (make_ty t_to) (make_exp e) make_exp (Note InlineCall e) = C.Note "InlineCall" (make_exp e) @@ -184,7 +154,7 @@ 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 (make_con_qid (tyConName tc))) (map make_ty ts) --- The special case for newtypes says "do not expand newtypes". +-- 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! -- If you just see occurrence names, name capture may occur. @@ -196,19 +166,16 @@ make_ty (TyConApp tc ts) = foldl C.Tapp (C.Tcon (make_con_qid (tyConName tc))) -- expose the representation in interface files, which definitely isn't right. -- Maybe CoreTidy should know whether to expand newtypes or not? -make_ty (NewTcApp tc ts) = foldl C.Tapp (C.Tcon (make_con_qid (tyConName tc))) - (map make_ty ts) - make_ty (PredTy p) = make_ty (predTypeRep p) make_ty (NoteTy _ t) = make_ty t make_kind :: Kind -> C.Kind -make_kind (FunTy k1 k2) = C.Karrow (make_kind k1) (make_kind k2) -make_kind k | k `eqKind` liftedTypeKind = C.Klifted -make_kind k | k `eqKind` unliftedTypeKind = C.Kunlifted -make_kind k | k `eqKind` openTypeKind = C.Kopen +make_kind (FunKind k1 k2) = C.Karrow (make_kind k1) (make_kind k2) +make_kind LiftedTypeKind = C.Klifted +make_kind UnliftedTypeKind = C.Kunlifted +make_kind OpenTypeKind = C.Kopen make_kind _ = error "MkExternalCore died: make_kind" {- Id generation. -} @@ -233,7 +200,7 @@ make_var_id :: Name -> C.Id make_var_id = make_id True make_mid :: Module -> C.Id -make_mid = moduleNameString . moduleName +make_mid = moduleString make_qid :: Bool -> Name -> C.Qual C.Id make_qid is_var n = (mname,make_id is_var n)