X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=29be17e2a6f8b960d9a901dd40ee72a0ee485dd1;hb=f6af3fa05093ff703d587bb2b11c4ad008dc9ca5;hp=ce9112de962f14eb2633ebef8a3cba322ea89186;hpb=9003a18c4efa4548ae80709aef9963f7b544ded3;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index ce9112d..29be17e 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -4,36 +4,36 @@ \section[TcTyDecls]{Typecheck type declarations} \begin{code} -module TcTyDecls ( tcTyDecl, kcConDetails ) where +module TcTyDecls ( tcTyDecl, kcConDetails, tcMkDataCon ) where #include "HsVersions.h" -import HsSyn ( TyClDecl(..), ConDecl(..), ConDetails(..), +import HsSyn ( TyClDecl(..), ConDecl(..), HsConDetails(..), BangType, getBangType, getBangStrictness, conDetailsTys ) import RnHsSyn ( RenamedTyClDecl, RenamedConDecl, RenamedContext ) -import BasicTypes ( NewOrData(..) ) +import BasicTypes ( NewOrData(..), StrictnessMark ) import TcMonoType ( tcHsTyVars, tcHsTheta, tcHsType, kcHsContext, kcHsSigType, kcHsLiftedSigType ) -import TcEnv ( tcExtendTyVarEnv, - tcLookupTyCon, tcLookupRecId, - TyThingDetails(..), RecTcEnv - ) -import TcType ( tyVarsOfTypes, tyVarsOfPred, ThetaType ) -import TcMonad +import TcEnv ( tcExtendTyVarEnv, tcLookupTyCon, TyThingDetails(..) ) +import TcType ( Type, tyVarsOfTypes, tyVarsOfPred, ThetaType ) +import RnEnv ( lookupSysName ) +import TcRnMonad import DataCon ( DataCon, mkDataCon, dataConFieldLabels ) -import FieldLabel ( fieldLabelName, fieldLabelType, allFieldLabelTags, mkFieldLabel ) -import MkId ( mkDataConId, mkDataConWrapId, mkRecordSelId ) +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, DataConDetails(..), visibleDataCons, - tyConTyVars ) + tyConTyVars, tyConName ) import VarSet ( intersectVarSet, isEmptyVarSet ) -import PrelNames ( unpackCStringName, unpackCStringUtf8Name ) +import Generics ( mkTyConGenInfo ) +import CmdLineOpts ( DynFlag(..) ) import List ( nubBy ) \end{code} @@ -44,43 +44,56 @@ import List ( nubBy ) %************************************************************************ \begin{code} -tcTyDecl :: RecTcEnv -> RenamedTyClDecl -> TcM (Name, TyThingDetails) -tcTyDecl 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) $ - tcHsType rhs `thenTc` \ rhs_ty -> - returnTc (tycon_name, SynTyDetails rhs_ty) + tcHsType rhs `thenM` \ rhs_ty -> + returnM (tycon_name, SynTyDetails rhs_ty) -tcTyDecl unf_env (TyData {tcdND = new_or_data, tcdCtxt = context, - tcdName = tycon_name, tcdCons = con_decls}) - = tcLookupTyCon tycon_name `thenNF_Tc` \ tycon -> +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 `thenTc` \ ctxt -> - tcConDecls new_or_data tycon tyvars ctxt con_decls `thenTc` \ data_cons -> + tcHsTheta context `thenM` \ ctxt -> + tcConDecls new_or_data tycon tyvars ctxt con_decls `thenM` \ data_cons -> let - sel_ids = mkRecordSelectors unf_env tycon data_cons + sel_ids = mkRecordSelectors tycon data_cons in - returnTc (tycon_name, DataTyDetails ctxt data_cons sel_ids) + tcGenericInfo tycon generic `thenM` \ gen_info -> + returnM (tycon_name, DataTyDetails ctxt data_cons sel_ids gen_info) + +tcTyDecl (ForeignType {tcdName = tycon_name}) + = returnM (tycon_name, ForeignTyDetails) -tcTyDecl unf_env (ForeignType {tcdName = tycon_name}) - = returnTc (tycon_name, ForeignTyDetails) +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 unf_env tycon data_cons +mkRecordSelectors tycon data_cons = -- We'll check later that fields with the same name -- from different constructors have the same type. - [ mkRecordSelId tycon field unpack_id unpackUtf8_id + [ mkRecordSelId tycon field | field <- nubBy eq_name fields ] where fields = [ field | con <- visibleDataCons data_cons, field <- dataConFieldLabels con ] eq_name field1 field2 = fieldLabelName field1 == fieldLabelName field2 - - unpack_id = tcLookupRecId unf_env unpackCStringName - unpackUtf8_id = tcLookupRecId unf_env unpackCStringUtf8Name \end{code} @@ -91,10 +104,11 @@ mkRecordSelectors unf_env tycon data_cons %************************************************************************ \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 @@ -108,54 +122,72 @@ tcConDecls :: NewOrData -> TyCon -> [TyVar] -> ThetaType tcConDecls new_or_data tycon tyvars ctxt con_decls = case con_decls of - Unknown -> returnTc Unknown - HasCons n -> returnTc (HasCons n) - DataCons cs -> mapTc tc_con_decl cs `thenTc` \ data_cons -> - returnTc (DataCons data_cons) + Unknown -> returnM Unknown + HasCons n -> returnM (HasCons n) + DataCons cs -> mappM tc_con_decl cs `thenM` \ data_cons -> + returnM (DataCons data_cons) where - tc_con_decl (ConDecl name wkr_name ex_tvs ex_ctxt details src_loc) - = tcAddSrcLoc src_loc $ + 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 `thenTc` \ ex_theta -> + tcHsTheta ex_ctxt `thenM` \ ex_theta -> case details of - VanillaCon btys -> tc_datacon ex_tyvars ex_theta btys + 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 - = mapTc tcHsType (map getBangType btys) `thenTc` \ arg_tys -> - mk_data_con ex_tyvars ex_theta (map getBangStrictness btys) arg_tys [] + = 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) `thenTc_` - mapTc tc_field (fields `zip` allFieldLabelTags) `thenTc` \ field_labels_s -> + = checkTc (null ex_tyvars) (exRecConErr name) `thenM_` + mappM tc_field (fields `zip` allFieldLabelTags) `thenM` \ field_labels -> 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 - ] + arg_stricts = [getBangStrictness bty | (n, bty) <- fields] + arg_tys = map fieldLabelType field_labels in - mk_data_con ex_tyvars ex_theta arg_stricts - (map fieldLabelType field_labels) field_labels + tcMkDataCon name arg_stricts field_labels + tyvars ctxt ex_tyvars ex_theta + arg_tys tycon - tc_field ((field_label_names, bty), tag) - = tcHsType (getBangType bty) `thenTc` \ field_ty -> - returnTc [mkFieldLabel (getName name) tycon field_ty tag | name <- field_label_names] + tc_field ((field_label_name, bty), tag) + = tcHsType (getBangType bty) `thenM` \ field_ty -> + returnM (mkFieldLabel field_label_name tycon field_ty tag) - 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 +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