X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcClassDcl.lhs;h=36bef1183db462aa07b54d87070b6724870a73b1;hb=83f16ade9edf272c88c6b2ed8b8e951b905fe130;hp=13b6300d4a945b5817012cee9951b283e92cf9e9;hpb=f87cc9cfccf83b21a66501f9654d3e6f1fa7adb4;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcClassDcl.lhs b/compiler/typecheck/TcClassDcl.lhs index 13b6300..36bef11 100644 --- a/compiler/typecheck/TcClassDcl.lhs +++ b/compiler/typecheck/TcClassDcl.lhs @@ -19,9 +19,10 @@ import RnHsSyn import RnExpr import Inst import InstEnv +import TcPat( addInlinePrags ) import TcEnv import TcBinds -import TcSimplify +import TcUnify import TcHsType import TcMType import TcType @@ -96,48 +97,36 @@ Death to "ExpandingDicts". tcClassSigs :: Name -- Name of the class -> [LSig Name] -> LHsBinds Name - -> TcM [TcMethInfo] + -> TcM [TcMethInfo] -- One for each method tcClassSigs clas sigs def_methods - = do { dm_env <- mapM (addLocM (checkDefaultBind clas op_names)) - (bagToList def_methods) - ; mapM (tcClassSig (mkNameEnv dm_env)) op_sigs } - where - op_sigs = [sig | sig@(L _ (TypeSig _ _)) <- sigs] - op_names = [n | (L _ (TypeSig (L _ n) _)) <- op_sigs] - -checkDefaultBind :: Name -> [Name] -> HsBindLR Name Name -> TcM (Name, DefMethSpec) - -- Check default bindings - -- a) must be for a class op for this class - -- b) must be all generic or all non-generic -checkDefaultBind clas ops (FunBind {fun_id = L _ op, fun_matches = MatchGroup matches _ }) - = do { -- Check that the op is from this class - checkTc (op `elem` ops) (badMethodErr clas op) - - -- Check that all the defns ar generic, or none are - ; case (none_generic, all_generic) of - (True, _) -> return (op, VanillaDM) - (_, True) -> return (op, GenericDM) - _ -> failWith (mixedGenericErr op) - } - where - n_generic = count (isJust . maybeGenericMatch) matches - none_generic = n_generic == 0 - all_generic = matches `lengthIs` n_generic - -checkDefaultBind _ _ b = pprPanic "checkDefaultBind" (ppr b) + = do { -- Check that all def_methods are in the class + ; op_info <- mapM (addLocM tc_sig) [sig | sig@(L _ (TypeSig _ _)) <- sigs] + ; let op_names = [ n | (n,_,_) <- op_info ] + ; sequence [ failWithTc (badMethodErr clas n) + | n <- dm_bind_names, not (n `elem` op_names) ] + -- Value binding for non class-method (ie no TypeSig) -tcClassSig :: NameEnv DefMethSpec -- Info about default methods; - -> LSig Name - -> TcM TcMethInfo + ; sequence [ failWithTc (badGenericMethod clas n) + | n <- genop_names, not (n `elem` dm_bind_names) ] + -- Generic signature without value binding -tcClassSig dm_env (L loc (TypeSig (L _ op_name) op_hs_ty)) - = setSrcSpan loc $ do - { op_ty <- tcHsKindedType op_hs_ty -- Class tyvars already in scope - ; let dm = lookupNameEnv dm_env op_name `orElse` NoDM - ; return (op_name, dm, op_ty) } -tcClassSig _ s = pprPanic "tcClassSig" (ppr s) + ; return op_info } + where + dm_bind_names :: [Name] -- These ones have a value binding in the class decl + dm_bind_names = [op | L _ (FunBind {fun_id = L _ op}) <- bagToList def_methods] + + genop_names :: [Name] -- These ones have a generic signature + genop_names = [n | L _ (GenericSig (L _ n) _) <- sigs] + + tc_sig (TypeSig (L _ op_name) op_hs_ty) + = do { op_ty <- tcHsKindedType op_hs_ty -- Class tyvars already in scope + ; let dm | op_name `elem` genop_names = GenericDM + | op_name `elem` dm_bind_names = VanillaDM + | otherwise = NoDM + ; return (op_name, dm, op_ty) } + tc_sig sig = pprPanic "tc_cls_sig" (ppr sig) \end{code} @@ -167,100 +156,110 @@ tcClassDecl2 (L loc (ClassDecl {tcdLName = class_name, tcdSigs = sigs, -- default methods. Better to make separate AbsBinds for each ; let (tyvars, _, _, op_items) = classBigSig clas - rigid_info = ClsSkol clas - prag_fn = mkPragFun sigs default_binds - sig_fn = mkTcSigFun sigs - clas_tyvars = tcSkolSigTyVars rigid_info tyvars + prag_fn = mkPragFun sigs default_binds + sig_fn = mkSigFun sigs + clas_tyvars = tcSuperSkolTyVars tyvars pred = mkClassPred clas (mkTyVarTys clas_tyvars) - ; inst_loc <- getInstLoc (SigOrigin rigid_info) - ; this_dict <- newDictBndr inst_loc pred + ; this_dict <- newEvVar pred + ; traceTc "TIM2" (ppr sigs) ; let tc_dm = tcDefMeth clas clas_tyvars - this_dict default_binds + this_dict default_binds sigs sig_fn prag_fn ; dm_binds <- tcExtendTyVarEnv clas_tyvars $ mapM tc_dm op_items - ; return (listToBag (catMaybes dm_binds)) } + ; return (unionManyBags dm_binds) } tcClassDecl2 d = pprPanic "tcClassDecl2" (ppr d) -tcDefMeth :: Class -> [TyVar] -> Inst -> LHsBinds Name - -> TcSigFun -> TcPragFun -> ClassOpItem - -> TcM (Maybe (LHsBind Id)) +tcDefMeth :: Class -> [TyVar] -> EvVar -> LHsBinds Name -> [LSig Name] + -> SigFun -> PragFun -> ClassOpItem + -> TcM (LHsBinds TcId) -- Generate code for polymorphic default methods only (hence DefMeth) -- (Generic default methods have turned into instance decls by now.) -- This is incompatible with Hugs, which expects a polymorphic -- default method for every class op, regardless of whether or not -- the programmer supplied an explicit default decl for the class. -- (If necessary we can fix that, but we don't have a convenient Id to hand.) -tcDefMeth clas tyvars this_dict binds_in sig_fn prag_fn (sel_id, dm_info) - = case dm_info of - NoDefMeth -> return Nothing - GenDefMeth -> return Nothing - DefMeth dm_name -> do - { let sel_name = idName sel_id - ; local_dm_name <- newLocalName sel_name - -- Base the local_dm_name on the selector name, because - -- type errors from tcInstanceMethodBody come from here - - -- See Note [Silly default-method bind] - -- (possibly out of date) - - ; let meth_bind = findMethodBind sel_name local_dm_name binds_in - `orElse` pprPanic "tcDefMeth" (ppr sel_id) - -- dm_info = DefMeth dm_name only if there is a binding in binds_in - - dm_sig_fn _ = sig_fn sel_name - dm_id = mkDefaultMethodId sel_id dm_name - local_dm_type = instantiateMethod clas sel_id (mkTyVarTys tyvars) - local_dm_id = mkLocalId local_dm_name local_dm_type - - ; (dm_id_w_inline, spec_prags) - <- tcPrags NonRecursive False True dm_id (prag_fn sel_name) - - ; warnTc (not (null spec_prags)) - (ptext (sLit "Ignoring SPECIALISE pragmas on default method") - <+> quotes (ppr sel_name)) - - ; liftM Just $ - tcInstanceMethodBody (instLoc this_dict) - tyvars [this_dict] - ([], emptyBag) - dm_id_w_inline local_dm_id - dm_sig_fn IsDefaultMethod meth_bind } +tcDefMeth clas tyvars this_dict binds_in sigs sig_fn prag_fn (sel_id, dm_info) + | NoDefMeth <- dm_info = return emptyBag + | otherwise + = do { (dm_id, tvs, sig_loc) <- tc_dm_id dm_info + ; let L loc meth_bind = findMethodBind sel_name binds_in + `orElse` pprPanic "tcDefMeth" (ppr sel_id) + dm_bind = L loc (meth_bind { fun_id = L loc (idName dm_id) }) + -- Substitute the meth_name for the binder + -- NB: the binding is always a FunBind + + dm_sig_fn _ = Just (clas_tv_names ++ tvs, sig_loc) + dm_prag_fn _ = prag_fn sel_name + + ; (binds,_) <- tcExtendIdEnv [dm_id] $ + tcPolyBinds TopLevel dm_sig_fn dm_prag_fn + NonRecursive NonRecursive + [dm_bind] + ; return binds } + where + sel_name = idName sel_id + clas_tv_names = map getName tyvars + + -- Find the 'generic op :: ty' signature among the sigs + -- If dm_info is GenDefMeth, the corresponding signature + -- should jolly well exist! Hence the panic + genop_lhs_ty = case [lty | L _ (GenericSig (L _ n) lty) <- sigs + , n == sel_name ] of + [lty] -> lty + _ -> pprPanic "tcDefMeth" (ppr sel_name $$ ppr sigs) + + tc_dm_id :: DefMeth -> TcM (Id, [Name], SrcSpan) + -- Make a default-method Id of the appropriate type + -- That may entail getting the generic-default signature + -- from the type signatures. + -- Also return the in-scope tyvars for the default method, and their binding site + tc_dm_id NoDefMeth = panic "tc_dm_id" + tc_dm_id (DefMeth dm_name) + | Just (tvs, loc) <- sig_fn sel_name + = return (mkDefaultMethodId sel_id dm_name, tvs, loc) + | otherwise + = pprPanic "No sig for" (ppr sel_name) + tc_dm_id (GenDefMeth dm_name) + = setSrcSpan loc $ + do { tau <- tcHsKindedType genop_lhs_ty + ; checkValidType (FunSigCtxt sel_name) tau + ; return ( mkExportedLocalId dm_name (mkForAllTys tyvars tau) + , hsExplicitTvs genop_lhs_ty, loc ) } + where + loc = getLoc genop_lhs_ty --------------- -tcInstanceMethodBody :: InstLoc -> [TcTyVar] -> [Inst] - -> ([Inst], LHsBinds Id) -> Id -> Id - -> TcSigFun -> TcSpecPrags -> LHsBind Name +tcInstanceMethodBody :: SkolemInfo -> [TcTyVar] -> [EvVar] + -> Id -> Id + -> SigFun -> TcSpecPrags -> LHsBind Name -> TcM (LHsBind Id) -tcInstanceMethodBody inst_loc tyvars dfun_dicts - (this_dict, this_bind) meth_id local_meth_id - meth_sig_fn spec_prags bind@(L loc _) +tcInstanceMethodBody skol_info tyvars dfun_ev_vars + meth_id local_meth_id + meth_sig_fn specs + (L loc bind) = do { -- Typecheck the binding, first extending the envt -- so that when tcInstSig looks up the local_meth_id to find -- its signature, we'll find it in the environment - ; ((tc_bind, _), lie) <- getLIE $ - tcExtendIdEnv [local_meth_id] $ - tcPolyBinds TopLevel meth_sig_fn no_prag_fn - NonRecursive NonRecursive - (unitBag bind) - - ; let avails = this_dict ++ dfun_dicts - -- Only need the this_dict stuff if there are type - -- variables involved; otherwise overlap is not possible - -- See Note [Subtle interaction of recursion and overlap] - -- in TcInstDcls - ; lie_binds <- tcSimplifyCheck inst_loc tyvars avails lie - - ; let full_bind = AbsBinds tyvars dfun_lam_vars - [(tyvars, meth_id, local_meth_id, spec_prags)] - (this_bind `unionBags` lie_binds - `unionBags` tc_bind) - - dfun_lam_vars = map instToVar dfun_dicts -- Includes equalities + let lm_bind = L loc (bind { fun_id = L loc (idName local_meth_id) }) + -- Substitute the local_meth_name for the binder + -- NB: the binding is always a FunBind + ; traceTc "TIM" (ppr local_meth_id $$ ppr (meth_sig_fn (idName local_meth_id))) + ; (ev_binds, (tc_bind, _)) + <- checkConstraints skol_info tyvars dfun_ev_vars $ + tcExtendIdEnv [local_meth_id] $ + tcPolyBinds TopLevel meth_sig_fn no_prag_fn + NonRecursive NonRecursive + [lm_bind] + + ; let full_bind = AbsBinds { abs_tvs = tyvars, abs_ev_vars = dfun_ev_vars + , abs_exports = [(tyvars, meth_id, local_meth_id, specs)] + , abs_ev_binds = ev_binds + , abs_binds = tc_bind } ; return (L loc full_bind) } where @@ -293,18 +292,16 @@ instantiateMethod clas sel_id inst_tys --------------------------- --- The renamer just puts the selector ID as the binder in the method binding --- but we must use the method name; so we substitute it here. Crude but simple. -findMethodBind :: Name -> Name -- Selector and method name +findMethodBind :: Name -- Selector name -> LHsBinds Name -- A group of bindings - -> Maybe (LHsBind Name) -- The binding, with meth_name replacing sel_name -findMethodBind sel_name meth_name binds + -> Maybe (LHsBind Name) -- The binding +findMethodBind sel_name binds = foldlBag mplus Nothing (mapBag f binds) where - f (L loc1 bind@(FunBind { fun_id = L loc2 op_name })) - | op_name == sel_name - = Just (L loc1 (bind { fun_id = L loc2 meth_name })) - f _other = Nothing + f bind@(L _ (FunBind { fun_id = L _ op_name })) + | op_name == sel_name + = Just bind + f _other = Nothing \end{code} Note [Polymorphic methods] @@ -365,40 +362,19 @@ gives rise to the instance declarations \begin{code} mkGenericDefMethBind :: Class -> [Type] -> Id -> Name -> TcM (LHsBind Name) -mkGenericDefMethBind clas inst_tys sel_id meth_name +mkGenericDefMethBind clas inst_tys sel_id dm_name = -- A generic default method - -- If the method is defined generically, we can only do the job if the - -- instance declaration is for a single-parameter type class with - -- a type constructor applied to type arguments in the instance decl - -- (checkTc, so False provokes the error) - do { checkTc (isJust maybe_tycon) - (badGenericInstance sel_id (notSimple inst_tys)) - ; checkTc (tyConHasGenerics tycon) - (badGenericInstance sel_id (notGeneric tycon)) - - ; dflags <- getDOpts + -- If the method is defined generically, we only have to call the + -- dm_name. + do { dflags <- getDOpts ; liftIO (dumpIfSet_dyn dflags Opt_D_dump_deriv "Filling in method body" (vcat [ppr clas <+> ppr inst_tys, nest 2 (ppr sel_id <+> equals <+> ppr rhs)])) - -- Rename it before returning it - ; (rn_rhs, _) <- rnLExpr rhs - ; return (noLoc $ mkFunBind (noLoc meth_name) [mkSimpleMatch [] rn_rhs]) } + ; return (noLoc $ mkFunBind (noLoc (idName sel_id)) + [mkSimpleMatch [] rhs]) } where - rhs = mkGenericRhs sel_id clas_tyvar tycon - - -- The tycon is only used in the generic case, and in that - -- case we require that the instance decl is for a single-parameter - -- type class with type variable arguments: - -- instance (...) => C (T a b) - clas_tyvar = ASSERT (not (null (classTyVars clas))) head (classTyVars clas) - Just tycon = maybe_tycon - maybe_tycon = case inst_tys of - [ty] -> case tcSplitTyConApp_maybe ty of - Just (tycon, arg_tys) | all tcIsTyVarTy arg_tys -> Just tycon - _ -> Nothing - _ -> Nothing - + rhs = nlHsVar dm_name --------------------------- getGenericInstances :: [LTyClDecl Name] -> TcM [InstInfo Name] @@ -411,9 +387,8 @@ getGenericInstances class_decls else do -- Otherwise print it out - { dflags <- getDOpts - ; liftIO (dumpIfSet_dyn dflags Opt_D_dump_deriv "Generic instances" - (vcat (map pprInstInfoDetails gen_inst_info))) + { dumpDerivingInfo $ hang (ptext (sLit "Generic instances")) + 2 (vcat (map pprInstInfoDetails gen_inst_info)) ; return gen_inst_info }} get_generics :: TyClDecl Name -> TcM [InstInfo Name] @@ -531,7 +506,7 @@ mkGenericInstance clas (hs_ty, binds) = do let inst_theta = [mkClassPred clas [mkTyVarTy tv] | tv <- tyvars] dfun_id = mkDictFunId dfun_name tyvars inst_theta clas [inst_ty] - ispec = mkLocalInstance dfun_id overlap_flag + ispec = mkLocalInstance dfun_id overlap_flag return (InstInfo { iSpec = ispec, iBinds = VanillaInst binds [] False }) \end{code} @@ -567,6 +542,11 @@ badMethodErr clas op = hsep [ptext (sLit "Class"), quotes (ppr clas), ptext (sLit "does not have a method"), quotes (ppr op)] +badGenericMethod :: Outputable a => a -> Name -> SDoc +badGenericMethod clas op + = hsep [ptext (sLit "Class"), quotes (ppr clas), + ptext (sLit "has a generic-default signature without a binding"), quotes (ppr op)] + badATErr :: Class -> Name -> SDoc badATErr clas at = hsep [ptext (sLit "Class"), quotes (ppr clas), @@ -595,7 +575,7 @@ notGeneric tycon badGenericInstanceType :: LHsBinds Name -> SDoc badGenericInstanceType binds = vcat [ptext (sLit "Illegal type pattern in the generic bindings"), - nest 4 (ppr binds)] + nest 2 (ppr binds)] missingGenericInstances :: [Name] -> SDoc missingGenericInstances missing @@ -604,7 +584,7 @@ missingGenericInstances missing dupGenericInsts :: [(TyCon, InstInfo a)] -> SDoc dupGenericInsts tc_inst_infos = vcat [ptext (sLit "More than one type pattern for a single generic type constructor:"), - nest 4 (vcat (map ppr_inst_ty tc_inst_infos)), + nest 2 (vcat (map ppr_inst_ty tc_inst_infos)), ptext (sLit "All the type patterns for a generic type constructor must be identical") ] where