X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FMkExternalCore.lhs;h=1dc3b7e929b43d88710440ed8fd8314ce7113d05;hp=3315240edd01e9a7401a8d087501ae42fd842260;hb=2fbab1a0f1a017799e8f5130bdf1078060623f29;hpb=ee2dd59cf1c96437696b9ec39b35dd1beea259a1 diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs index 3315240..1dc3b7e 100644 --- a/compiler/coreSyn/MkExternalCore.lhs +++ b/compiler/coreSyn/MkExternalCore.lhs @@ -1,8 +1,7 @@ -% -% (c) The University of Glasgow 2001 + +% (c) The University of Glasgow 2001-2006 % \begin{code} - module MkExternalCore ( emitExternalCore ) where @@ -10,50 +9,49 @@ module MkExternalCore ( #include "HsVersions.h" import qualified ExternalCore as C -import Char import Module import CoreSyn import HscTypes import TyCon import TypeRep import Type -import PprExternalCore -- Instances -import DataCon ( DataCon, dataConTyVars, dataConRepArgTys, - dataConName, dataConTyCon ) -import CoreSyn +import PprExternalCore () -- Instances +import DataCon +import Coercion import Var import IdInfo -import Kind import Literal import Name +import NameSet +import UniqSet import Outputable import ForeignCall -import DynFlags ( DynFlags(..) ) -import StaticFlags ( opt_EmitExternalCore ) +import DynFlags +import StaticFlags import IO import FastString -emitExternalCore :: DynFlags -> CgGuts -> IO () -emitExternalCore dflags cg_guts +emitExternalCore :: DynFlags -> NameSet -> CgGuts -> IO () +emitExternalCore dflags exports cg_guts | opt_EmitExternalCore = (do handle <- openFile corename WriteMode - hPutStrLn handle (show (mkExternalCore cg_guts)) + hPutStrLn handle (show (mkExternalCore exports cg_guts)) hClose handle) - `catch` (\err -> pprPanic "Failed to open or write external core output file" - (text corename)) + `catch` (\_ -> pprPanic "Failed to open or write external core output file" + (text corename)) where corename = extCoreName dflags -emitExternalCore _ _ +emitExternalCore _ _ _ | otherwise = return () -mkExternalCore :: CgGuts -> C.Module +mkExternalCore :: NameSet -> 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 (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds}) - = C.Module mname tdefs (map make_vdef binds) +mkExternalCore exports (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds}) + = C.Module mname tdefs (map (make_vdef exports) binds) where mname = make_mid this_mod tdefs = foldr collect_tdefs [] tycons @@ -63,25 +61,40 @@ collect_tdefs tcon tdefs | isAlgTyCon tcon = tdef: tdefs where tdef | isNewTyCon tcon = - C.Newtype (make_con_qid (tyConName tcon)) (map make_tbind tyvars) repclause --- 20060420 GHC handles empty data types just fine. ExtCore should too! jds --- | null (tyConDataCons tcon) = error "MkExternalCore died: can't handle datatype declarations with no data constructors" + C.Newtype (qtc tcon) (map make_tbind tyvars) + (case newTyConCo_maybe tcon of + Just coercion -> (qtc coercion, + make_kind $ (uncurry mkCoKind) $ + case isCoercionTyCon_maybe coercion of + -- See Note [Newtype coercions] in + -- types/TyCon + Just (arity,coKindFun) -> coKindFun $ + map mkTyVarTy $ take arity tyvars + Nothing -> pprPanic ("MkExternalCore:\ + coercion tcon should have a kind fun") + (ppr tcon)) + Nothing -> pprPanic ("MkExternalCore: newtype tcon\ + should have a coercion: ") (ppr tcon)) + repclause | otherwise = - C.Data (make_con_qid (tyConName tcon)) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) - where repclause | isRecursiveTyCon tcon = Nothing - | otherwise = Just (make_ty rep) - where (_, rep) = newTyConRep tcon + C.Data (qtc tcon) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) + where repclause | isRecursiveTyCon tcon || isOpenTyCon tcon= Nothing + | otherwise = Just (make_ty (repType rhs)) + where (_, rhs) = newTyConRhs tcon tyvars = tyConTyVars tcon collect_tdefs _ tdefs = tdefs +qtc :: TyCon -> C.Qual C.Tcon +qtc = make_con_qid . tyConName + make_cdef :: DataCon -> C.Cdef 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 = drop (tyConArity (dataConTyCon dcon)) (dataConTyVars dcon) + ex_tyvars = dataConExTyVars dcon tys = map make_ty (dataConRepArgTys dcon) make_tbind :: TyVar -> C.Tbind @@ -90,12 +103,14 @@ 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_vdef :: CoreBind -> C.Vdefg -make_vdef b = +make_vdef :: NameSet -> CoreBind -> C.Vdefg +make_vdef exports 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 (idType v),make_exp e) + where + f (v,e) = (local, make_var_id (Var.varName v), make_ty (idType v),make_exp e) + where local = not $ elementOfUniqSet (Var.varName v) exports -- Top level bindings are unqualified now make_exp :: CoreExpr -> C.Exp @@ -103,20 +118,25 @@ 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 (idType v)) - FCallId _ -> error "MkExternalCore died: can't handle non-static-C foreign call" + FCallId (CCall (CCallSpec (StaticTarget nm) callconv _)) + -> C.External (unpackFS nm) (showSDoc (ppr callconv)) (make_ty (idType 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.Var (make_var_qid (Var.varName v)) -make_exp (Lit (l@(MachLabel s _))) = error "MkExternalCore died: can't handle \"foreign label\" declarations" +make_exp (Lit (MachLabel s _)) = C.Label (unpackFS s) make_exp (Lit l) = C.Lit (make_lit l) make_exp (App e (Type t)) = C.Appt (make_exp e) (make_ty t) 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 (Cast e co) = C.Cast (make_exp e) (make_ty co) +make_exp (Let b e) = C.Let (make_vdef emptyNameSet b) (make_exp e) -- 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 (SCC _) e) = C.Note "SCC" (make_exp e) -- temporary make_exp (Note (CoreNote s) e) = C.Note s (make_exp e) -- hdaume: core annotations make_exp (Note InlineMe e) = C.Note "InlineMe" (make_exp e) make_exp _ = error "MkExternalCore died: make_exp" @@ -128,8 +148,13 @@ make_alt (DataAlt dcon, vs, e) = (map make_vbind vbs) (make_exp e) where (tbs,vbs) = span isTyVar vs -make_alt (LitAlt l,_,e) = C.Alit (make_lit l) (make_exp e) -make_alt (DEFAULT,[],e) = C.Adefault (make_exp e) +make_alt (LitAlt l,_,e) = C.Alit (make_lit l) (make_exp e) +make_alt (DEFAULT,[],e) = C.Adefault (make_exp e) +-- This should never happen, as the DEFAULT alternative binds no variables, +-- but we might as well check for it: +make_alt a@(DEFAULT,_ ,_) = pprPanic ("MkExternalCore: make_alt: DEFAULT " + ++ "alternative had a non-empty var list") (ppr a) + make_lit :: Literal -> C.Lit make_lit l = @@ -152,7 +177,7 @@ 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 (make_con_qid (tyConName tc))) +make_ty (TyConApp tc ts) = foldl C.Tapp (C.Tcon (qtc tc)) (map make_ty ts) -- Newtypes are treated just like any other type constructor; not expanded -- Reason: predTypeRep does substitution and, while substitution deals @@ -167,42 +192,41 @@ make_ty (TyConApp tc ts) = foldl C.Tapp (C.Tcon (make_con_qid (tyConName tc))) -- Maybe CoreTidy should know whether to expand newtypes or not? make_ty (PredTy p) = make_ty (predTypeRep p) -make_ty (NoteTy _ t) = make_ty t make_kind :: Kind -> C.Kind -make_kind (FunKind k1 k2) = C.Karrow (make_kind k1) (make_kind k2) -make_kind LiftedTypeKind = C.Klifted -make_kind UnboxedTypeKind = C.Kunboxed -make_kind UnliftedTypeKind = C.Kunlifted -make_kind OpenTypeKind = C.Kopen +make_kind (PredTy p) | isEqPred p = C.Keq (make_ty t1) (make_ty t2) + where (t1, t2) = getEqPredTys p +make_kind (FunTy k1 k2) = C.Karrow (make_kind k1) (make_kind k2) +make_kind k + | isLiftedTypeKind k = C.Klifted + | isUnliftedTypeKind k = C.Kunlifted + | isOpenTypeKind k = C.Kopen make_kind _ = error "MkExternalCore died: make_kind" {- Id generation. -} -{- Use encoded strings. - Also, adjust casing to work around some badly-chosen internal names. -} make_id :: Bool -> Name -> C.Id -make_id is_var nm = (occNameString . nameOccName) nm - -{- SIMON thinks this stuff isn't necessary -make_id is_var nm = - case n of - 'Z':cs | is_var -> 'z':cs - 'z':cs | not is_var -> 'Z':cs - c:cs | isUpper c && is_var -> 'z':'d':n - c:cs | isLower c && (not is_var) -> 'Z':'d':n - _ -> n - where n = (occNameString . nameOccName) nm --} +make_id _is_var nm = (occNameString . nameOccName) nm make_var_id :: Name -> C.Id make_var_id = make_id True +-- It's important to encode the module name here, because in External Core, +-- base:GHC.Base => base:GHCziBase +-- We don't do this in pprExternalCore because we +-- *do* want to keep the package name (we don't want baseZCGHCziBase, +-- because that would just be ugly.) +-- SIGH. make_mid :: Module -> C.Id -make_mid = moduleString - +-- Super ugly code, but I can't find anything else that does quite what I +-- want (encodes the hierarchical module name without encoding the colon +-- that separates the package name from it.) +make_mid m = (packageIdString (modulePackageId m)) ++ + ":" ++ + showSDoc (pprCode CStyle (pprModuleName (moduleName m))) + make_qid :: Bool -> Name -> C.Qual C.Id make_qid is_var n = (mname,make_id is_var n) where mname =