X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=29be17e2a6f8b960d9a901dd40ee72a0ee485dd1;hb=05afb7485eea44d6410139f8a20c94b6f66c46f2;hp=bde665527a38cb7682abcf8eed73238b575dd50c;hpb=788faebb40b51d37e73ed94dfc99460d39a1a811;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index bde6655..29be17e 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -4,44 +4,37 @@ \section[TcTyDecls]{Typecheck type declarations} \begin{code} -module TcTyDecls ( - tcTyDecl1, kcConDetails, mkNewTyConRep - ) where +module TcTyDecls ( tcTyDecl, kcConDetails, tcMkDataCon ) where #include "HsVersions.h" -import HsSyn ( TyClDecl(..), ConDecl(..), ConDetails(..), BangType(..), - getBangType, conDetailsTys +import HsSyn ( TyClDecl(..), ConDecl(..), HsConDetails(..), BangType, + getBangType, getBangStrictness, conDetailsTys ) import RnHsSyn ( RenamedTyClDecl, RenamedConDecl, RenamedContext ) -import BasicTypes ( NewOrData(..), RecFlag, isRec ) +import BasicTypes ( NewOrData(..), StrictnessMark ) -import TcMonoType ( tcHsRecType, tcHsTyVars, tcRecTheta, +import TcMonoType ( tcHsTyVars, tcHsTheta, tcHsType, kcHsContext, kcHsSigType, kcHsLiftedSigType ) -import TcEnv ( tcExtendTyVarEnv, - tcLookupTyCon, tcLookupRecId, - TyThingDetails(..), RecTcEnv - ) -import TcMonad - -import DataCon ( DataCon, mkDataCon, dataConFieldLabels, markedStrict, - notMarkedStrict, markedUnboxed, dataConRepType - ) -import MkId ( mkDataConId, mkDataConWrapId, mkRecordSelId ) -import FieldLabel +import TcEnv ( tcExtendTyVarEnv, tcLookupTyCon, TyThingDetails(..) ) +import TcType ( Type, tyVarsOfTypes, tyVarsOfPred, ThetaType ) +import RnEnv ( lookupSysName ) +import TcRnMonad + +import DataCon ( DataCon, mkDataCon, dataConFieldLabels ) +import FieldLabel ( FieldLabel, fieldLabelName, fieldLabelType, allFieldLabelTags, mkFieldLabel ) +import MkId ( mkDataConWorkId, mkDataConWrapId, mkRecordSelId ) import Var ( TyVar ) -import Name ( Name, NamedThing(..) ) +import Name ( Name ) +import OccName ( mkDataConWrapperOcc, mkDataConWorkerOcc, mkGenOcc1, mkGenOcc2 ) import Outputable -import TyCon ( TyCon, isNewTyCon, tyConTyVars ) -import Type ( tyVarsOfTypes, tyVarsOfPred, splitFunTy, applyTys, - mkTyConApp, mkTyVarTys, mkForAllTys, - splitAlgTyConApp_maybe, Type, ThetaType - ) -import TysWiredIn ( unitTy ) +import TyCon ( TyCon, DataConDetails(..), visibleDataCons, + tyConTyVars, tyConName ) import VarSet ( intersectVarSet, isEmptyVarSet ) -import PrelNames ( unpackCStringName, unpackCStringUtf8Name ) -import ListSetOps ( equivClasses ) +import Generics ( mkTyConGenInfo ) +import CmdLineOpts ( DynFlag(..) ) +import List ( nubBy ) \end{code} %************************************************************************ @@ -51,59 +44,56 @@ import ListSetOps ( equivClasses ) %************************************************************************ \begin{code} -tcTyDecl1 :: RecFlag -> RecTcEnv -> RenamedTyClDecl -> TcM (Name, TyThingDetails) -tcTyDecl1 is_rec unf_env (TySynonym {tcdName = tycon_name, tcdSynRhs = rhs}) - = tcLookupTyCon tycon_name `thenNF_Tc` \ tycon -> +tcTyDecl :: RenamedTyClDecl -> TcM (Name, TyThingDetails) +tcTyDecl (TySynonym {tcdName = tycon_name, tcdSynRhs = rhs}) + = tcLookupTyCon tycon_name `thenM` \ tycon -> tcExtendTyVarEnv (tyConTyVars tycon) $ - tcHsRecType is_rec rhs `thenTc` \ rhs_ty -> - -- Note tcHsRecType not tcHsRecSigType; 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 is_rec unf_env (TyData {tcdND = new_or_data, tcdCtxt = context, - tcdName = tycon_name, tcdCons = con_decls}) - = tcLookupTyCon tycon_name `thenNF_Tc` \ tycon -> + tcHsType rhs `thenM` \ rhs_ty -> + returnM (tycon_name, SynTyDetails rhs_ty) + +tcTyDecl (TyData {tcdND = new_or_data, tcdCtxt = context, + tcdName = tycon_name, tcdCons = con_decls, + tcdGeneric = generic}) + = tcLookupTyCon tycon_name `thenM` \ tycon -> let tyvars = tyConTyVars tycon in tcExtendTyVarEnv tyvars $ + tcHsTheta context `thenM` \ ctxt -> + tcConDecls new_or_data tycon tyvars ctxt con_decls `thenM` \ data_cons -> + let + sel_ids = mkRecordSelectors tycon data_cons + in + tcGenericInfo tycon generic `thenM` \ gen_info -> + returnM (tycon_name, DataTyDetails ctxt data_cons sel_ids gen_info) - -- Typecheck the pieces - tcRecTheta is_rec context `thenTc` \ ctxt -> - mapTc (tcConDecl is_rec new_or_data tycon tyvars ctxt) con_decls `thenTc` \ data_cons -> - tcRecordSelectors is_rec unf_env tycon data_cons `thenTc` \ sel_ids -> - returnTc (tycon_name, DataTyDetails ctxt data_cons sel_ids) -\end{code} +tcTyDecl (ForeignType {tcdName = tycon_name}) + = returnM (tycon_name, ForeignTyDetails) -\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))) +tcGenericInfo tycon generics -- Source code decl: consult the flag + = do_we_want generics `thenM` \ want_generics -> + if want_generics then + mapM (lookupSysName (tyConName tycon)) + [mkGenOcc1, mkGenOcc2] `thenM` \ gen_sys_names -> + returnM (mkTyConGenInfo tycon gen_sys_names) + else + returnM Nothing + where + do_we_want (Just g) = returnM g -- Interface file decl + -- so look at decl + do_we_want Nothing = doptM Opt_Generics -- Source code decl + -- so look at flag + +mkRecordSelectors tycon data_cons + = -- We'll check later that fields with the same name + -- from different constructors have the same type. + [ mkRecordSelId tycon field + | field <- nubBy eq_name fields ] 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 - } + fields = [ field | con <- visibleDataCons data_cons, + field <- dataConFieldLabels con ] + eq_name field1 field2 = fieldLabelName field1 == fieldLabelName field2 \end{code} @@ -114,10 +104,11 @@ mkNewTyConRep tc %************************************************************************ \begin{code} -kcConDetails :: NewOrData -> RenamedContext -> ConDetails Name -> TcM () +kcConDetails :: NewOrData -> RenamedContext + -> HsConDetails Name (BangType Name) -> TcM () kcConDetails new_or_data ex_ctxt details - = kcHsContext ex_ctxt `thenTc_` - mapTc_ kc_sig_type (conDetailsTys details) + = kcHsContext ex_ctxt `thenM_` + mappM_ kc_sig_type (conDetailsTys details) where kc_sig_type = case new_or_data of DataType -> kcHsSigType @@ -126,54 +117,77 @@ kcConDetails new_or_data ex_ctxt details -- going to remove the constructor while coercing it to a lifted type. -tcConDecl :: RecFlag -> NewOrData -> TyCon -> [TyVar] -> ThetaType -> RenamedConDecl -> TcM DataCon +tcConDecls :: NewOrData -> TyCon -> [TyVar] -> ThetaType + -> DataConDetails RenamedConDecl -> TcM (DataConDetails DataCon) -tcConDecl is_rec new_or_data tycon tyvars ctxt (ConDecl name wkr_name ex_tvs ex_ctxt details src_loc) - = tcAddSrcLoc src_loc $ - tcHsTyVars ex_tvs (kcConDetails new_or_data ex_ctxt details) $ \ ex_tyvars -> - tcRecTheta is_rec 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] - RecCon fields -> tc_rec_con ex_tyvars ex_theta fields +tcConDecls new_or_data tycon tyvars ctxt con_decls + = case con_decls of + Unknown -> returnM Unknown + HasCons n -> returnM (HasCons n) + DataCons cs -> mappM tc_con_decl cs `thenM` \ data_cons -> + returnM (DataCons data_cons) where - tc_datacon ex_tyvars ex_theta btys - = let - arg_stricts = map getBangStrictness btys - tys = map getBangType btys - in - mapTc (tcHsRecType is_rec) tys `thenTc` \ arg_tys -> - mk_data_con ex_tyvars ex_theta arg_stricts arg_tys [] - - 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_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 ex_tyvars ex_theta arg_stricts - (map fieldLabelType field_labels) field_labels - - tc_field ((field_label_names, bty), tag) - = tcHsRecType is_rec (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 - arg_tys - 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 + tc_con_decl (ConDecl name ex_tvs ex_ctxt details src_loc) + = addSrcLoc src_loc $ + tcHsTyVars ex_tvs (kcConDetails new_or_data ex_ctxt details) $ \ ex_tyvars -> + tcHsTheta ex_ctxt `thenM` \ ex_theta -> + case details of + PrefixCon btys -> tc_datacon ex_tyvars ex_theta btys + InfixCon bty1 bty2 -> tc_datacon ex_tyvars ex_theta [bty1,bty2] + RecCon fields -> tc_rec_con ex_tyvars ex_theta fields + where + + tc_datacon ex_tyvars ex_theta btys + = mappM tcHsType (map getBangType btys) `thenM` \ arg_tys -> + tcMkDataCon name + (map getBangStrictness btys) + [{- No field labels -}] + tyvars ctxt ex_tyvars ex_theta + arg_tys tycon + + tc_rec_con ex_tyvars ex_theta fields + = checkTc (null ex_tyvars) (exRecConErr name) `thenM_` + mappM tc_field (fields `zip` allFieldLabelTags) `thenM` \ field_labels -> + let + arg_stricts = [getBangStrictness bty | (n, bty) <- fields] + arg_tys = map fieldLabelType field_labels + in + tcMkDataCon name arg_stricts field_labels + tyvars ctxt ex_tyvars ex_theta + arg_tys tycon + + tc_field ((field_label_name, bty), tag) + = tcHsType (getBangType bty) `thenM` \ field_ty -> + returnM (mkFieldLabel field_label_name tycon field_ty tag) + +tcMkDataCon :: Name + -> [StrictnessMark] -> [FieldLabel] + -> [TyVar] -> ThetaType + -> [TyVar] -> ThetaType + -> [Type] -> TyCon + -> TcM DataCon +-- A wrapper for DataCon.mkDataCon that +-- a) makes the worker Id +-- b) makes the wrapper Id if necessary, including +-- allocating its unique (hence monadic) +tcMkDataCon src_name arg_stricts fields + tyvars ctxt ex_tyvars ex_theta + arg_tys tycon + = lookupSysName src_name mkDataConWrapperOcc `thenM` \ wrap_name -> + lookupSysName src_name mkDataConWorkerOcc `thenM` \ work_name -> + -- This last one takes the name of the data constructor in the source + -- code, which (for Haskell source anyway) will be in the SrcDataName name + -- space, and makes it into a "real data constructor name" + let + data_con = mkDataCon src_name arg_stricts fields + tyvars (thinContext arg_tys ctxt) + ex_tyvars ex_theta + arg_tys tycon + data_con_work_id data_con_wrap_id + data_con_work_id = mkDataConWorkId work_name data_con + data_con_wrap_id = mkDataConWrapId wrap_name data_con + in + returnM data_con -- The context for a data constructor should be limited to -- the type variables mentioned in the arg_tys @@ -183,67 +197,17 @@ thinContext arg_tys ctxt arg_tyvars = tyVarsOfTypes arg_tys in_arg_tys pred = not $ isEmptyVarSet $ tyVarsOfPred pred `intersectVarSet` arg_tyvars - -getBangStrictness (Banged _) = markedStrict -getBangStrictness (Unbanged _) = notMarkedStrict -getBangStrictness (Unpacked _) = markedUnboxed \end{code} %************************************************************************ %* * -\subsection{Record selectors} -%* * -%************************************************************************ - -\begin{code} -tcRecordSelectors is_rec unf_env tycon data_cons - -- Omit the check that the fields have consistent types if - -- the group is recursive; TcTyClsDecls.tcGroup will repeat - -- with NonRecursive once we have tied the knot - | isRec is_rec = returnTc sel_ids - | otherwise = mapTc check groups `thenTc_` - returnTc sel_ids - where - fields = [ field | con <- data_cons - , field <- dataConFieldLabels con ] - - -- groups is list of fields that share a common name - groups = equivClasses cmp_name fields - cmp_name field1 field2 = fieldLabelName field1 `compare` fieldLabelName field2 - - sel_ids = [ mkRecordSelId tycon field unpack_id unpackUtf8_id - | (field : _) <- groups ] - - check fields@(first_field_label : other_fields) - -- These fields all have the same name, but are from - -- different constructors in the data type - = -- Check that all the fields in the group have the same type - -- NB: this check assumes that all the constructors of a given - -- data type use the same type variables - checkTc (all (== field_ty) other_tys) (fieldTypeMisMatch field_name) - where - field_ty = fieldLabelType first_field_label - field_name = fieldLabelName first_field_label - other_tys = map fieldLabelType other_fields - - unpack_id = tcLookupRecId unf_env unpackCStringName - unpackUtf8_id = tcLookupRecId unf_env unpackCStringUtf8Name -\end{code} - - - -%************************************************************************ -%* * \subsection{Errors and contexts} %* * %************************************************************************ \begin{code} -fieldTypeMisMatch field_name - = sep [ptext SLIT("Different constructors give different types for field"), quotes (ppr field_name)] - exRecConErr name = ptext SLIT("Can't combine named fields with locally-quantified type variables") $$