X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreUtils.lhs;h=b79837919fec928ca2d183acfee9c85b1e9b68fd;hb=19e64b50409a331ddf816cb4c7f33d646dabd43a;hp=1bd0acd07de3604a8c56288a7370290d82e4f84e;hpb=9621257fcd85a572a5c305b77995bda62689bb86;p=ghc-hetmet.git diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs index 1bd0acd..b798379 100644 --- a/compiler/coreSyn/CoreUtils.lhs +++ b/compiler/coreSyn/CoreUtils.lhs @@ -33,7 +33,7 @@ module CoreUtils ( -- Equality cheapEqExpr, tcEqExpr, tcEqExprX, applyTypeToArgs, applyTypeToArg, - dataConInstPat, dataConOccInstPat + dataConOrigInstPat, dataConRepInstPat, dataConRepFSInstPat ) where #include "HsVersions.h" @@ -46,7 +46,7 @@ import CoreFVs ( exprFreeVars ) import PprCore ( pprCoreExpr ) import Var ( Var, TyVar, CoVar, isCoVar, tyVarKind, setVarUnique, mkCoVar, mkTyVar, mkCoVar ) -import OccName ( OccName, occNameFS, mkVarOcc ) +import OccName ( OccName, occNameFS, mkVarOccFS ) import VarSet ( unionVarSet ) import VarEnv import Name ( hashName, mkSysTvName ) @@ -55,9 +55,10 @@ import Packages ( isDllName ) #endif import Literal ( hashLiteral, literalType, litIsDupable, litIsTrivial, isZeroLit, Literal( MachLabel ) ) -import DataCon ( DataCon, dataConRepArity, +import DataCon ( DataCon, dataConRepArity, eqSpecPreds, isVanillaDataCon, dataConTyCon, dataConRepArgTys, - dataConUnivTyVars, dataConExTyVars, dataConEqSpec ) + dataConUnivTyVars, dataConExTyVars, dataConEqSpec, + dataConOrigArgTys ) import PrimOp ( PrimOp(..), primOpOkForSpeculation, primOpIsCheap ) import Id ( Id, idType, globalIdDetails, idNewStrictness, mkWildId, idArity, idName, idUnfolding, idInfo, @@ -87,7 +88,7 @@ import Outputable import DynFlags ( DynFlags, DynFlag(Opt_DictsCheap), dopt ) import TysPrim ( alphaTy ) -- Debugging only import Util ( equalLength, lengthAtLeast, foldl2 ) -import FastString ( mkFastString ) +import FastString ( FastString ) \end{code} @@ -679,12 +680,19 @@ deepCast ty tyVars co -- coArgs = [right (left (left co)), right (left co), right co] coArgs = decomposeCo (length tyVars) co --- This goes here to avoid circularity between DataCon and Id -dataConInstPat :: [Unique] -- A long enough list of uniques, at least one for each binder - -> DataCon - -> [Type] -- Types to instantiate the universally quantified tyvars - -> ([TyVar], [CoVar], [Id]) -- Return instantiated variables --- dataConInstPat us con inst_tys returns a triple (ex_tvs, co_tvs, arg_ids), +-- These InstPat functions go here to avoid circularity between DataCon and Id +dataConOrigInstPat = dataConInstPat dataConOrigArgTys (repeat (FSLIT("ipv"))) +dataConRepInstPat = dataConInstPat dataConRepArgTys (repeat (FSLIT("ipv"))) +dataConRepFSInstPat = dataConInstPat dataConRepArgTys + +dataConInstPat :: (DataCon -> [Type]) -- function used to find arg tys + -> [FastString] -- A long enough list of FSs to use for names + -> [Unique] -- An equally long list of uniques, at least one for each binder + -> DataCon + -> [Type] -- Types to instantiate the universally quantified tyvars + -> ([TyVar], [CoVar], [Id]) -- Return instantiated variables +-- dataConInstPat arg_fun us fss con inst_tys returns a triple +-- (ex_tvs, co_tvs, arg_ids), -- -- ex_tvs are intended to be used as binders for existential type args -- @@ -710,64 +718,48 @@ dataConInstPat :: [Unique] -- A long enough list of uniques, at -- ([a1'', a2'', b''],[c :: (a1',a2'):=:(a1'',a2'')],[x :: Int,y :: b'']) -- -- where the double-primed variables are created from the unique list input -dataConInstPat uniqs con inst_tys - = dataConOccInstPat uniqs occs con inst_tys - where - -- dataConOccInstPat doesn't actually make use of the OccName directly for - -- existential and coercion variable binders, so it is right to just - -- use the VarName namespace for all of the OccNames - occs = mk_occs 1 - mk_occs n = mkVarOcc ("ipv" ++ show n) : mk_occs (n+1) - -dataConOccInstPat :: [Unique] -- A long enough list of uniques, at least one for each binder - -> [OccName] -- An equally long list of OccNames to use - -> DataCon - -> [Type] -- Types to instantiate the universally quantified tyvars - -> ([TyVar], [CoVar], [Id]) -- Return instantiated variables --- This function actually does the job specified in the comment for --- dataConInstPat, but uses the specified list of OccNames. This is --- is necessary for use in e.g. tcIfaceDataAlt -dataConOccInstPat uniqs occs con inst_tys +-- getting names from the FS list input +dataConInstPat arg_fun fss uniqs con inst_tys = (ex_bndrs, co_bndrs, id_bndrs) where univ_tvs = dataConUnivTyVars con ex_tvs = dataConExTyVars con - arg_tys = dataConRepArgTys con + arg_tys = arg_fun con eq_spec = dataConEqSpec con - eq_preds = [ mkEqPred (mkTyVarTy tv, ty) | (tv,ty) <- eq_spec ] + eq_preds = eqSpecPreds eq_spec n_ex = length ex_tvs n_co = length eq_spec n_id = length arg_tys - -- split the Uniques and OccNames + -- split the Uniques and FastStrings (ex_uniqs, uniqs') = splitAt n_ex uniqs (co_uniqs, id_uniqs) = splitAt n_co uniqs' - (ex_occs, occs') = splitAt n_ex occs - (co_occs, id_occs) = splitAt n_co occs' + (ex_fss, fss') = splitAt n_ex fss + (co_fss, id_fss) = splitAt n_co fss' -- make existential type variables - mk_ex_var uniq occ var = mkTyVar new_name kind + mk_ex_var uniq fs var = mkTyVar new_name kind where - new_name = mkSysTvName uniq (occNameFS occ) + new_name = mkSysTvName uniq fs kind = tyVarKind var - ex_bndrs = zipWith3 mk_ex_var ex_uniqs ex_occs ex_tvs + ex_bndrs = zipWith3 mk_ex_var ex_uniqs ex_fss ex_tvs -- make the instantiation substitution inst_subst = substTyWith (univ_tvs ++ ex_tvs) (inst_tys ++ map mkTyVarTy ex_bndrs) -- make new coercion vars, instantiating kind - mk_co_var uniq occ eq_pred = mkCoVar new_name (inst_subst (mkPredTy eq_pred)) + mk_co_var uniq fs eq_pred = mkCoVar new_name (inst_subst (mkPredTy eq_pred)) where - new_name = mkSysTvName uniq (occNameFS occ) + new_name = mkSysTvName uniq fs - co_bndrs = zipWith3 mk_co_var co_uniqs co_occs eq_preds + co_bndrs = zipWith3 mk_co_var co_uniqs co_fss eq_preds -- make value vars, instantiating types - mk_id_var uniq occ ty = mkUserLocal occ uniq (inst_subst ty) noSrcLoc - id_bndrs = zipWith3 mk_id_var id_uniqs id_occs arg_tys + mk_id_var uniq fs ty = mkUserLocal (mkVarOccFS fs) uniq (inst_subst ty) noSrcLoc + id_bndrs = zipWith3 mk_id_var id_uniqs id_fss arg_tys exprIsConApp_maybe :: CoreExpr -> Maybe (DataCon, [CoreExpr]) -- Returns (Just (dc, [x1..xn])) if the argument expression is @@ -1161,8 +1153,7 @@ eta_expand n us expr ty Lam lam_tv (eta_expand n us2 (App expr (Type (mkTyVarTy lam_tv))) (substTyWith [tv] [mkTyVarTy lam_tv] ty')) where lam_tv = mkTyVar (mkSysTvName uniq FSLIT("etaT")) (tyVarKind tv) - (uniq:us2) = us - + (uniq:us2) = us ; Nothing -> case splitFunTy_maybe ty of {