X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=acb15586e8c677fadfdabf3452b3f14eeffa5812;hb=1683eefd522552901d2b49b3c6619d07dcc5d467;hp=5d549435163559652b6bcea505c87dcc97797e0e;hpb=3160f854580e6d8df412c8cd34d93bae27175d67;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index 5d54943..acb1558 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -5,224 +5,209 @@ \begin{code} module TcTyDecls ( - tcTyDecl, kcTyDecl, - tcConDecl, - mkDataBinds + tcTyDecl1, + kcConDetails, + mkImplicitDataBinds, mkNewTyConRep ) where #include "HsVersions.h" import HsSyn ( MonoBinds(..), TyClDecl(..), ConDecl(..), ConDetails(..), BangType(..), - andMonoBindList + andMonoBindList, getBangType ) -import RnHsSyn ( RenamedTyClDecl, RenamedConDecl ) -import TcHsSyn ( TcMonoBinds ) -import BasicTypes ( RecFlag(..), NewOrData(..), StrictnessMark(..) ) +import RnHsSyn ( RenamedTyClDecl, RenamedConDecl, RenamedContext ) +import TcHsSyn ( TcMonoBinds, idsToMonoBinds ) +import BasicTypes ( RecFlag(..), NewOrData(..) ) -import TcMonoType ( tcExtendTopTyVarScope, tcExtendTyVarScope, - tcHsTypeKind, tcHsType, tcHsTopType, tcHsTopBoxedType, - tcContext +import TcMonoType ( tcHsType, tcHsSigType, tcHsBoxedSigType, kcTyVarScope, tcClassContext, + kcHsContext, kcHsSigType, mkImmutTyVars ) -import TcType ( zonkTcTyVarToTyVar, zonkTcThetaType ) -import TcEnv ( tcLookupTy, TcTyThing(..) ) +import TcEnv ( tcExtendTyVarEnv, tcLookupTy, tcLookupValueByKey, TyThing(..), TyThingDetails(..) ) import TcMonad import TcUnify ( unifyKind ) -import Class ( Class ) -import DataCon ( DataCon, dataConSig, mkDataCon, isNullaryDataCon, - dataConFieldLabels, dataConId +import Class ( Class, ClassContext ) +import DataCon ( DataCon, mkDataCon, + dataConFieldLabels, dataConId, dataConWrapId, + markedStrict, notMarkedStrict, markedUnboxed, dataConRepType ) -import MkId ( mkDataConId, mkRecordSelId, mkNewTySelId ) -import Id ( getIdUnfolding ) -import CoreUnfold ( getUnfoldingTemplate ) +import MkId ( mkDataConId, mkDataConWrapId, mkRecordSelId ) import FieldLabel import Var ( Id, TyVar ) -import Name ( isLocallyDefined, OccName, NamedThing(..) ) +import Name ( Name, isLocallyDefined, OccName, NamedThing(..), nameUnique ) import Outputable -import TyCon ( TyCon, mkSynTyCon, mkAlgTyCon, isAlgTyCon, - isSynTyCon, tyConDataCons, isNewTyCon +import TyCon ( TyCon, AlgTyConFlavour(..), ArgVrcs, mkSynTyCon, mkAlgTyCon, + tyConDataConsIfAvailable, tyConTyVars, + isSynTyCon, isNewTyCon ) -import Type ( getTyVar, tyVarsOfTypes, +import Type ( getTyVar, tyVarsOfTypes, splitFunTy, applyTys, mkTyConApp, mkTyVarTys, mkForAllTys, mkFunTy, - mkTyVarTy, + mkTyVarTy, splitAlgTyConApp_maybe, mkArrowKind, mkArrowKinds, boxedTypeKind, - isUnboxedType, Type, ThetaType + isUnboxedType, Type, ThetaType, classesOfPreds ) +import TysWiredIn ( unitTy ) import Var ( tyVarKind ) import VarSet ( intersectVarSet, isEmptyVarSet ) +import Unique ( unpackCStringIdKey ) import Util ( equivClasses ) +import FiniteMap ( FiniteMap, lookupWithDefaultFM ) \end{code} %************************************************************************ %* * -\subsection{Kind checking} -%* * -%************************************************************************ - -\begin{code} -kcTyDecl :: RenamedTyClDecl -> TcM s () - -kcTyDecl (TySynonym name tyvar_names rhs src_loc) - = tcLookupTy name `thenNF_Tc` \ (kind, _, _) -> - tcExtendTopTyVarScope kind tyvar_names $ \ _ result_kind -> - tcHsTypeKind rhs `thenTc` \ (rhs_kind, _) -> - unifyKind result_kind rhs_kind - -kcTyDecl (TyData _ context tycon_name tyvar_names con_decls _ _ src_loc) - = tcLookupTy tycon_name `thenNF_Tc` \ (kind, _, _) -> - tcExtendTopTyVarScope kind tyvar_names $ \ result_kind _ -> - tcContext context `thenTc_` - mapTc kcConDecl con_decls `thenTc_` - returnTc () - -kcConDecl (ConDecl _ ex_tvs ex_ctxt details loc) - = tcAddSrcLoc loc ( - tcExtendTyVarScope ex_tvs ( \ tyvars -> - tcContext ex_ctxt `thenTc_` - kc_con details `thenTc_` - returnTc () - )) - where - kc_con (VanillaCon btys) = mapTc kc_bty btys `thenTc_` returnTc () - kc_con (InfixCon bty1 bty2) = mapTc kc_bty [bty1,bty2] `thenTc_` returnTc () - kc_con (NewCon ty _) = tcHsType ty `thenTc_` returnTc () - kc_con (RecCon flds) = mapTc kc_field flds `thenTc_` returnTc () - - kc_bty (Banged ty) = tcHsType ty - kc_bty (Unbanged ty) = tcHsType ty - - kc_field (_, bty) = kc_bty bty -\end{code} - - -%************************************************************************ -%* * \subsection{Type checking} %* * %************************************************************************ \begin{code} -tcTyDecl :: RecFlag -> RenamedTyClDecl -> TcM s TyCon - -tcTyDecl is_rec (TySynonym tycon_name tyvar_names rhs src_loc) - = tcLookupTy tycon_name `thenNF_Tc` \ (tycon_kind, Just arity, _) -> - tcExtendTopTyVarScope tycon_kind tyvar_names $ \ tyvars _ -> - tcHsTopType rhs `thenTc` \ rhs_ty -> +tcTyDecl1 :: RenamedTyClDecl -> TcM s (Name, TyThingDetails) +tcTyDecl1 (TySynonym tycon_name tyvar_names rhs src_loc) + = tcLookupTy tycon_name `thenNF_Tc` \ (ATyCon tycon) -> + tcExtendTyVarEnv (tyConTyVars tycon) $ + tcHsType rhs `thenTc` \ rhs_ty -> + -- Note tcHsType not tcHsSigType; we allow type synonyms + -- that aren't types; e.g. type List = [] + -- + -- If the RHS mentions tyvars that aren't in scope, we'll + -- quantify over them: + -- e.g. type T = a->a + -- will become type T = forall a. a->a + -- + -- With gla-exts that's right, but for H98 we should complain. + -- We can now do that here without falling into + -- a black hole, we still do it in rnDecl (TySynonym case) + + returnTc (tycon_name, SynTyDetails rhs_ty) + +tcTyDecl1 (TyData _ context tycon_name _ con_decls _ derivings _ src_loc) + = tcLookupTy tycon_name `thenNF_Tc` \ (ATyCon tycon) -> let - -- Construct the tycon - tycon = mkSynTyCon tycon_name tycon_kind arity tyvars rhs_ty + tyvars = tyConTyVars tycon in - returnTc tycon - - -tcTyDecl is_rec (TyData data_or_new context tycon_name tyvar_names con_decls derivings pragmas src_loc) - = -- Lookup the pieces - tcLookupTy tycon_name `thenNF_Tc` \ (tycon_kind, _, ATyCon rec_tycon) -> - tcExtendTopTyVarScope tycon_kind tyvar_names $ \ tyvars _ -> + tcExtendTyVarEnv tyvars $ -- Typecheck the pieces - tcContext context `thenTc` \ ctxt -> - mapTc (tcConDecl rec_tycon tyvars ctxt) con_decls `thenTc` \ data_cons -> + tcClassContext context `thenTc` \ ctxt -> tc_derivs derivings `thenTc` \ derived_classes -> + mapTc (tcConDecl tycon tyvars ctxt) con_decls `thenTc` \ data_cons -> - let - -- Construct the tycon - real_data_or_new = case data_or_new of - NewType -> NewType - DataType | all isNullaryDataCon data_cons -> EnumType - | otherwise -> DataType - - tycon = mkAlgTyCon tycon_name tycon_kind tyvars ctxt - data_cons - derived_classes - Nothing -- Not a dictionary - real_data_or_new is_rec - in - returnTc tycon + returnTc (tycon_name, DataTyDetails ctxt data_cons derived_classes) where - tc_derivs Nothing = returnTc [] - tc_derivs (Just ds) = mapTc tc_deriv ds + tc_derivs Nothing = returnTc [] + tc_derivs (Just ds) = mapTc tc_deriv ds - tc_deriv name = tcLookupTy name `thenTc` \ (_, _, AClass clas) -> - returnTc clas + tc_deriv name = tcLookupTy name `thenTc` \ (AClass clas) -> + returnTc clas +\end{code} + +\begin{code} +mkNewTyConRep :: TyCon -> Type +-- Find the representation type for this newtype TyCon +-- The trick is to to deal correctly with recursive newtypes +-- such as newtype T = MkT T + +mkNewTyConRep tc + = mkForAllTys tvs (loop [] (mkTyConApp tc (mkTyVarTys tvs))) + where + tvs = tyConTyVars tc + loop tcs ty = case splitAlgTyConApp_maybe ty of { + Nothing -> ty ; + Just (tc, tys, data_cons) | not (isNewTyCon tc) -> ty + | tc `elem` tcs -> unitTy + | otherwise -> + + case splitFunTy (applyTys (dataConRepType (head data_cons)) tys) of + (rep_ty, _) -> loop (tc:tcs) rep_ty + } \end{code} %************************************************************************ %* * -\subsection{Type check constructors} +\subsection{Kind and type check constructors} %* * %************************************************************************ \begin{code} -tcConDecl :: TyCon -> [TyVar] -> ThetaType -> RenamedConDecl -> TcM s DataCon - -tcConDecl tycon tyvars ctxt (ConDecl name ex_tvs ex_ctxt details src_loc) - = tcAddSrcLoc src_loc $ - tcExtendTyVarScope ex_tvs $ \ ex_tyvars -> - tcContext ex_ctxt `thenTc` \ ex_theta -> - tc_con_decl_help tycon tyvars ctxt name ex_tyvars ex_theta details - -tc_con_decl_help tycon tyvars ctxt name ex_tyvars ex_theta details - = case details of - VanillaCon btys -> tc_datacon btys - InfixCon bty1 bty2 -> tc_datacon [bty1,bty2] - NewCon ty mb_f -> tc_newcon ty mb_f - RecCon fields -> tc_rec_con fields +kcConDetails :: RenamedContext -> ConDetails Name -> TcM s () +kcConDetails ex_ctxt details + = kcHsContext ex_ctxt `thenTc_` + kc_con_details details + where + kc_con_details (VanillaCon btys) = mapTc_ kc_bty btys + kc_con_details (InfixCon bty1 bty2) = mapTc_ kc_bty [bty1,bty2] + kc_con_details (NewCon ty _) = kcHsSigType ty + kc_con_details (RecCon flds) = mapTc_ kc_field flds + + kc_field (_, bty) = kc_bty bty + + kc_bty bty = kcHsSigType (getBangType bty) + +tcConDecl :: TyCon -> [TyVar] -> ClassContext -> RenamedConDecl -> TcM s DataCon + +tcConDecl tycon tyvars ctxt (ConDecl name wkr_name ex_tvs ex_ctxt details src_loc) + = tcAddSrcLoc src_loc $ + kcTyVarScope ex_tvs (kcConDetails ex_ctxt details) `thenTc` \ ex_tv_kinds -> + let + ex_tyvars = mkImmutTyVars ex_tv_kinds + in + tcExtendTyVarEnv ex_tyvars $ + tcClassContext ex_ctxt `thenTc` \ ex_theta -> + case details of + VanillaCon btys -> tc_datacon ex_tyvars ex_theta btys + InfixCon bty1 bty2 -> tc_datacon ex_tyvars ex_theta [bty1,bty2] + NewCon ty mb_f -> tc_newcon ex_tyvars ex_theta ty mb_f + RecCon fields -> tc_rec_con ex_tyvars ex_theta fields where - tc_datacon btys + tc_datacon ex_tyvars ex_theta btys = let - arg_stricts = map get_strictness btys - tys = map get_pty btys + arg_stricts = map getBangStrictness btys + tys = map getBangType btys in - mapTc tcHsTopType tys `thenTc` \ arg_tys -> - mk_data_con arg_stricts arg_tys [] + mapTc tcHsSigType tys `thenTc` \ arg_tys -> + mk_data_con ex_tyvars ex_theta arg_stricts arg_tys [] - tc_newcon ty mb_f - = tcHsTopBoxedType ty `thenTc` \ arg_ty -> + tc_newcon ex_tyvars ex_theta ty mb_f + = tcHsBoxedSigType ty `thenTc` \ arg_ty -> -- can't allow an unboxed type here, because we're effectively -- going to remove the constructor while coercing it to a boxed type. let field_label = case mb_f of Nothing -> [] - Just f -> [mkFieldLabel (getName f) arg_ty (head allFieldLabelTags)] + Just f -> [mkFieldLabel (getName f) tycon arg_ty (head allFieldLabelTags)] in - mk_data_con [NotMarkedStrict] [arg_ty] field_label + mk_data_con ex_tyvars ex_theta [notMarkedStrict] [arg_ty] field_label - tc_rec_con fields - = checkTc (null ex_tyvars) (exRecConErr name) `thenTc_` - mapTc tc_field fields `thenTc` \ field_label_infos_s -> + tc_rec_con ex_tyvars ex_theta fields + = checkTc (null ex_tyvars) (exRecConErr name) `thenTc_` + mapTc tc_field (fields `zip` allFieldLabelTags) `thenTc` \ field_labels_s -> let - field_label_infos = concat field_label_infos_s - arg_stricts = [strict | (_, _, strict) <- field_label_infos] - arg_tys = [ty | (_, ty, _) <- field_label_infos] - - field_labels = [ mkFieldLabel (getName name) ty tag - | ((name, ty, _), tag) <- field_label_infos `zip` allFieldLabelTags ] + field_labels = concat field_labels_s + arg_stricts = [str | (ns, bty) <- fields, + let str = getBangStrictness bty, + n <- ns -- One for each. E.g x,y,z :: !Int + ] in - mk_data_con arg_stricts arg_tys field_labels - - tc_field (field_label_names, bty) - = tcHsTopType (get_pty bty) `thenTc` \ field_ty -> - returnTc [(name, field_ty, get_strictness bty) | name <- field_label_names] - - mk_data_con arg_stricts arg_tys fields - = -- Now we've checked all the field types we must - -- zonk the existential tyvars to finish the kind - -- inference on their kinds, and commit them to being - -- immutable type variables. (The top-level tyvars are - -- already fixed, by the preceding kind-inference pass.) - mapNF_Tc zonkTcTyVarToTyVar ex_tyvars `thenNF_Tc` \ ex_tyvars' -> - zonkTcThetaType ex_theta `thenNF_Tc` \ ex_theta' -> - let + mk_data_con ex_tyvars ex_theta arg_stricts + (map fieldLabelType field_labels) field_labels + + tc_field ((field_label_names, bty), tag) + = tcHsSigType (getBangType bty) `thenTc` \ field_ty -> + returnTc [mkFieldLabel (getName name) tycon field_ty tag | name <- field_label_names] + + mk_data_con ex_tyvars ex_theta arg_stricts arg_tys fields + = let data_con = mkDataCon name arg_stricts fields tyvars (thinContext arg_tys ctxt) - ex_tyvars' ex_theta' + ex_tyvars ex_theta arg_tys - tycon data_con_id - data_con_id = mkDataConId data_con + tycon data_con_id data_con_wrap_id + + data_con_id = mkDataConId wkr_name data_con + data_con_wrap_id = mkDataConWrapId data_con in returnNF_Tc data_con @@ -234,12 +219,10 @@ thinContext arg_tys ctxt arg_tyvars = tyVarsOfTypes arg_tys in_arg_tys (clas,tys) = not $ isEmptyVarSet $ tyVarsOfTypes tys `intersectVarSet` arg_tyvars - -get_strictness (Banged _) = MarkedStrict -get_strictness (Unbanged _) = NotMarkedStrict -get_pty (Banged ty) = ty -get_pty (Unbanged ty) = ty +getBangStrictness (Banged _) = markedStrict +getBangStrictness (Unbanged _) = notMarkedStrict +getBangStrictness (Unpacked _) = markedUnboxed \end{code} @@ -251,28 +234,34 @@ get_pty (Unbanged ty) = ty %************************************************************************ \begin{code} -mkDataBinds :: [TyCon] -> TcM s ([Id], TcMonoBinds) -mkDataBinds [] = returnTc ([], EmptyMonoBinds) -mkDataBinds (tycon : tycons) - | isSynTyCon tycon = mkDataBinds tycons - | otherwise = mkDataBinds_one tycon `thenTc` \ (ids1, b1) -> - mkDataBinds tycons `thenTc` \ (ids2, b2) -> +mkImplicitDataBinds :: [TyCon] -> TcM s ([Id], TcMonoBinds) +mkImplicitDataBinds [] = returnTc ([], EmptyMonoBinds) +mkImplicitDataBinds (tycon : tycons) + | isSynTyCon tycon = mkImplicitDataBinds tycons + | otherwise = mkImplicitDataBinds_one tycon `thenTc` \ (ids1, b1) -> + mkImplicitDataBinds tycons `thenTc` \ (ids2, b2) -> returnTc (ids1++ids2, b1 `AndMonoBinds` b2) -mkDataBinds_one tycon +mkImplicitDataBinds_one tycon = mapTc (mkRecordSelector tycon) groups `thenTc` \ sel_ids -> let - data_ids = map dataConId data_cons ++ sel_ids + unf_ids = sel_ids ++ data_con_wrapper_ids + all_ids = map dataConId data_cons ++ unf_ids -- For the locally-defined things - -- we need to turn the unfoldings inside the Ids into bindings, - binds = [ CoreMonoBind data_id (getUnfoldingTemplate (getIdUnfolding data_id)) - | data_id <- data_ids, isLocallyDefined data_id - ] + -- we need to turn the unfoldings inside the selector Ids into bindings, + -- and build bindigns for the constructor wrappers + binds | isLocallyDefined tycon = idsToMonoBinds unf_ids + | otherwise = EmptyMonoBinds in - returnTc (data_ids, andMonoBindList binds) + returnTc (all_ids, binds) where - data_cons = tyConDataCons tycon + data_cons = tyConDataConsIfAvailable tycon + -- Abstract types mean we don't bring the + -- data cons into scope, which should be fine + + data_con_wrapper_ids = map dataConWrapId data_cons + fields = [ (con, field) | con <- data_cons, field <- dataConFieldLabels con ] @@ -292,25 +281,12 @@ mkRecordSelector tycon fields@((first_con, first_field_label) : other_fields) -- data type use the same type variables = checkTc (all (== field_ty) other_tys) (fieldTypeMisMatch field_name) `thenTc_` - returnTc selector_id + tcLookupValueByKey unpackCStringIdKey `thenTc` \ unpack_id -> + returnTc (mkRecordSelId tycon first_field_label unpack_id) where field_ty = fieldLabelType first_field_label field_name = fieldLabelName first_field_label other_tys = [fieldLabelType fl | (_, fl) <- other_fields] - (tyvars, _, _, _, _, _) = dataConSig first_con - data_ty = mkTyConApp tycon (mkTyVarTys tyvars) - -- tyvars of first_con may be free in field_ty - -- Now build the selector - - selector_ty :: Type - selector_ty = mkForAllTys tyvars $ - mkFunTy data_ty $ - field_ty - - selector_id :: Id - selector_id - | isNewTyCon tycon = mkNewTySelId first_field_label selector_ty - | otherwise = mkRecordSelId first_field_label selector_ty \end{code}