X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcInstDcls.lhs;h=1bb1bb76710641a8b2d05ae7c0fbcf233b460a83;hb=44ba24dc84d271ca9bd5ab5060cb63ed87f585e3;hp=b05b5519429d7bf9f6e08c94255e0624355d0c03;hpb=5c71a3bc3e9acfe3bee384a7948696aa5ac71646;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcInstDcls.lhs b/compiler/typecheck/TcInstDcls.lhs index b05b551..1bb1bb7 100644 --- a/compiler/typecheck/TcInstDcls.lhs +++ b/compiler/typecheck/TcInstDcls.lhs @@ -15,7 +15,7 @@ import TcClassDcl ( tcMethodBind, mkMethodBind, badMethodErr, import TcRnMonad import TcMType ( tcSkolSigType, checkValidInstance, checkValidInstHead ) import TcType ( mkClassPred, tcSplitSigmaTy, tcSplitDFunHead, mkTyVarTys, - SkolemInfo(InstSkol), tcSplitDFunTy ) + SkolemInfo(InstSkol), tcSplitDFunTy, mkFunTy ) import Inst ( tcInstClassOp, newDicts, instToId, showLIE, getOverlapFlag, tcExtendLocalInstEnv ) import InstEnv ( mkLocalInstance, instanceDFunId ) @@ -26,14 +26,18 @@ import TcEnv ( InstInfo(..), InstBindings(..), import TcHsType ( kcHsSigType, tcHsKindedType ) import TcUnify ( checkSigTyVars ) import TcSimplify ( tcSimplifyCheck, tcSimplifySuperClasses ) -import Type ( zipOpenTvSubst, substTheta, substTys ) -import DataCon ( classDataCon ) -import Class ( classBigSig ) -import Var ( Id, idName, idType ) +import Type ( zipOpenTvSubst, substTheta, substTys, mkTyConApp, mkTyVarTy ) +import Coercion ( mkAppCoercion, mkAppsCoercion ) +import TyCon ( TyCon, newTyConCo ) +import DataCon ( classDataCon, dataConTyCon, dataConInstArgTys ) +import Class ( classBigSig, classMethods ) +import Var ( TyVar, Id, idName, idType ) +import Id ( mkSysLocal ) +import UniqSupply ( uniqsFromSupply, splitUniqSupply ) import MkId ( mkDictFunId ) import Name ( Name, getSrcLoc ) import Maybe ( catMaybes ) -import SrcLoc ( srcLocSpan, unLoc, noLoc, Located(..), srcSpanStart ) +import SrcLoc ( noSrcSpan, srcLocSpan, unLoc, noLoc, Located(..), srcSpanStart ) import ListSetOps ( minusList ) import Outputable import Bag @@ -333,71 +337,63 @@ tcInstDecl2 (InstInfo { iSpec = ispec, maybe_co_con = newTyConCo tycon ; (tvs, theta, inst_head) <- tcSkolSigType rigid_info inst_ty ; dicts <- newDicts origin theta - ; uniqs <- newUniqueSupply - ; let (rep_dict_id:sc_dict_ids) = map instToId dicts - -- (Here, wee are relying on the order of dictionary + ; uniqs <- newUniqueSupply + ; let (cls, cls_inst_tys) = tcSplitDFunHead inst_head + ; [this_dict] <- newDicts origin [mkClassPred cls rep_tys] + ; let (rep_dict_id:sc_dict_ids) = + if null dicts then + [instToId this_dict] + else + map instToId dicts + + -- (Here, we are relying on the order of dictionary -- arguments built by NewTypeDerived in TcDeriv.) - wrap_fn = CoTyLams tvs <.> CoLams dict_ids + wrap_fn = CoTyLams tvs <.> CoLams (rep_dict_id:sc_dict_ids) - coerced_rep_dict = mkHsCoerce co_fn (HsVar rep_dict_id) + coerced_rep_dict = mkHsCoerce (co_fn tvs cls_tycon) (HsVar rep_dict_id) - body | null sc_dicts = coerced_rep_dict - | otherwise = HsCase coerced_rep_dict $ - MatchGroup [the_match] inst_head - the_match = mkSimpleMatch [the_pat] the_rhs - op_ids = zipWith (mkSysLocal FSLIT("op")) - (uniqsFromSupply uniqs) op_tys - the_pat = ConPatOut { pat_con = cls_data_con, pat_tvs = [], - pat_dicts = map (WildPat . idType) sc_dict_ids, - pat_binds = emptyDictBinds, - pat_args = PrefixCon (map VarPat op_ids), - pat_ty = } - the_rhs = mkHsApps (dataConWrapId cls_data_con) types sc_dict_ids (map HsVar op_ids) - - ; return (unitBag (VarBind dfun_id (mkHsCoerce wrap_fn body))) } - where - co_fn :: ExprCoFn - co_fn | Just co_con <- newTyConCo tycon - = ExprCoFn (mkAppCoercion (mkAppsCoercion tycon rep_tys) - (mkTyConApp co_con tvs)) - | otherwise - = idCoerecion - -tcMethods origin clas inst_tyvars' dfun_theta' inst_tys' - avail_insts op_items (NewTypeDerived rep_tys) - = getInstLoc origin `thenM` \ inst_loc -> - mapAndUnzip3M (do_one inst_loc) op_items `thenM` \ (meth_ids, meth_binds, rhs_insts) -> - - tcSimplifyCheck - (ptext SLIT("newtype derived instance")) - inst_tyvars' avail_insts rhs_insts `thenM` \ lie_binds -> + body | null sc_dict_ids = coerced_rep_dict + | otherwise = HsCase (noLoc coerced_rep_dict) $ + MatchGroup [the_match] (mkFunTy in_dict_ty inst_head) + in_dict_ty = mkTyConApp cls_tycon cls_inst_tys - -- I don't think we have to do the checkSigTyVars thing + the_match = mkSimpleMatch [the_pat] the_rhs - returnM (meth_ids, lie_binds `unionBags` listToBag meth_binds) + (uniqs1, uniqs2) = splitUniqSupply uniqs + op_ids = zipWith (mkSysLocal FSLIT("op")) + (uniqsFromSupply uniqs1) op_tys + + dict_ids = zipWith (mkSysLocal FSLIT("dict")) + (uniqsFromSupply uniqs2) (map idType sc_dict_ids) + + the_pat = noLoc $ + ConPatOut { pat_con = noLoc cls_data_con, pat_tvs = [], + pat_dicts = dict_ids, + pat_binds = emptyLHsBinds, + pat_args = PrefixCon (map nlVarPat op_ids), + pat_ty = in_dict_ty} + + cls_data_con = classDataCon cls + cls_tycon = dataConTyCon cls_data_con + cls_arg_tys = dataConInstArgTys cls_data_con cls_inst_tys + + n_dict_args = if length dicts == 0 then 0 else length dicts - 1 + op_tys = drop n_dict_args cls_arg_tys + + the_rhs = mkHsConApp cls_data_con cls_inst_tys (map HsVar (sc_dict_ids ++ op_ids)) + dict = (mkHsCoerce wrap_fn body) + ; return (unitBag (noLoc $ VarBind (dfun_id) (noLoc dict))) } where - do_one inst_loc (sel_id, _) - = -- The binding is like "op @ NewTy = op @ RepTy" - -- Make the *binder*, like in mkMethodBind - tcInstClassOp inst_loc sel_id inst_tys' `thenM` \ meth_inst -> - - -- Make the *occurrence on the rhs* - tcInstClassOp inst_loc sel_id rep_tys' `thenM` \ rhs_inst -> - let - meth_id = instToId meth_inst - in - return (meth_id, noLoc (VarBind meth_id (nlHsVar (instToId rhs_inst))), rhs_inst) - - -- Instantiate rep_tys with the relevant type variables - -- This looks a bit odd, because inst_tyvars' are the skolemised version - -- of the type variables in the instance declaration; but rep_tys doesn't - -- have the skolemised version, so we substitute them in here - rep_tys' = substTys subst rep_tys - subst = zipOpenTvSubst inst_tyvars' (mkTyVarTys inst_tyvars') - - + co_fn :: [TyVar] -> TyCon -> ExprCoFn + co_fn tvs cls_tycon | Just co_con <- newTyConCo tycon + = ExprCoFn (mkAppCoercion -- (mkAppsCoercion + (mkTyConApp cls_tycon []) + -- rep_tys) + (mkTyConApp co_con (map mkTyVarTy tvs))) + | otherwise + = idCoercion tcInstDecl2 (InstInfo { iSpec = ispec, iBinds = VanillaInst monobinds uprags }) = let @@ -451,7 +447,7 @@ tcInstDecl2 (InstInfo { iSpec = ispec, iBinds = VanillaInst monobinds uprags }) checkSigTyVars inst_tyvars' `thenM_` -- Deal with 'SPECIALISE instance' pragmas - tcPrags dfun_id (filter isSpecInstLSig prags) `thenM` \ prags -> + tcPrags dfun_id (filter isSpecInstLSig uprags) `thenM` \ prags -> -- Create the result bindings let