X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyDecls.lhs;h=0eff0ad51c5bf9ba73d099aaeaa86ed5b200df60;hb=f7ecf7234c224489be8a5e63fced903b655d92ee;hp=89a90b033e2f063652ccc70655aaee31f04bebf6;hpb=c49d51f812da9b1c2ceca7e0dad8f2a3626041a9;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs index 89a90b0..0eff0ad 100644 --- a/ghc/compiler/typecheck/TcTyDecls.lhs +++ b/ghc/compiler/typecheck/TcTyDecls.lhs @@ -12,53 +12,59 @@ module TcTyDecls ( mkDataBinds ) where -import Ubiq{-uitous-} +IMP_Ubiq(){-uitous-} import HsSyn ( TyDecl(..), ConDecl(..), BangType(..), HsExpr(..), Match(..), GRHSsAndBinds(..), GRHS(..), OutPat(..), - HsBinds(..), HsLit, Stmt, Qual, ArithSeqInfo, + HsBinds(..), HsLit, Stmt, Qualifier, ArithSeqInfo, PolyType, Fake, InPat, Bind(..), MonoBinds(..), Sig, MonoType ) import RnHsSyn ( RenamedTyDecl(..), RenamedConDecl(..), RnName{-instance Outputable-} ) -import TcHsSyn ( mkHsTyLam, mkHsDictLam, tcIdType, zonkId, - TcHsBinds(..), TcIdOcc(..) +import TcHsSyn ( mkHsTyLam, mkHsDictLam, tcIdType, + SYN_IE(TcHsBinds), TcIdOcc(..) ) import Inst ( newDicts, InstOrigin(..), Inst ) -import TcMonoType ( tcMonoTypeKind, tcMonoType, tcContext ) +import TcMonoType ( tcMonoTypeKind, tcMonoType, tcPolyType, tcContext ) +import TcSimplify ( tcSimplifyThetas ) import TcType ( tcInstTyVars, tcInstType, tcInstId ) import TcEnv ( tcLookupTyCon, tcLookupTyVar, tcLookupClass, - tcLookupClassByKey, - newLocalId, newLocalIds + newLocalId, newLocalIds, tcLookupClassByKey ) -import TcMonad +import TcMonad hiding ( rnMtoTcM ) import TcKind ( TcKind, unifyKind, mkTcArrowKind, mkTcTypeKind ) -import Class ( GenClass{-instance Eq-} ) -import Id ( mkDataCon, dataConSig, mkRecordSelId, +import PprType ( GenClass, GenType{-instance Outputable-}, + GenTyVar{-instance Outputable-}{-ToDo:possibly rm-} + ) +import Class ( GenClass{-instance Eq-}, classInstEnv ) +import Id ( mkDataCon, dataConSig, mkRecordSelId, idType, dataConFieldLabels, dataConStrictMarks, StrictnessMark(..), GenId{-instance NamedThing-} ) import FieldLabel import Kind ( Kind, mkArrowKind, mkBoxedTypeKind ) -import SpecEnv ( SpecEnv(..), nullSpecEnv ) +import SpecEnv ( SpecEnv, nullSpecEnv ) import Name ( nameSrcLoc, isLocallyDefinedName, getSrcLoc, Name{-instance Ord3-} ) +import Outputable ( Outputable(..), interpp'SP ) import Pretty import TyCon ( TyCon, NewOrData(..), mkSynTyCon, mkDataTyCon, isDataTyCon, - tyConDataCons ) -import Type ( getTypeKind, getTyVar, tyVarsOfTypes, eqTy, + isNewTyCon, isSynTyCon, tyConDataCons + ) +import Type ( GenType, -- instances + typeKind, getTyVar, tyVarsOfTypes, eqTy, splitSigmaTy, applyTyCon, mkTyVarTys, mkForAllTys, mkFunTy, splitFunTy, mkTyVarTy, getTyVar_maybe ) -import TyVar ( getTyVarKind, elementOfTyVarSet, GenTyVar{-instance Eq-} ) -import Unique ( Unique {- instance Eq -}, dataClassKey ) -import UniqSet ( emptyUniqSet, mkUniqSet, uniqSetToList, unionManyUniqSets, UniqSet(..) ) -import Util ( equivClasses, zipEqual, panic, assertPanic ) +import TyVar ( tyVarKind, elementOfTyVarSet, GenTyVar{-instance Eq-} ) +import Unique ( Unique {- instance Eq -}, evalClassKey ) +import UniqSet ( emptyUniqSet, mkUniqSet, uniqSetToList, unionManyUniqSets, SYN_IE(UniqSet) ) +import Util ( equivClasses, zipEqual, nOfThem, panic, assertPanic ) \end{code} \begin{code} @@ -91,8 +97,8 @@ tcTyDecl (TySynonym tycon_name tyvar_names rhs src_loc) -- but the simplest thing to do seems to be to get the Kind by (lazily) -- looking at the tyvars and rhs_ty. result_kind, final_tycon_kind :: Kind -- NB not TcKind! - result_kind = getTypeKind rhs_ty - final_tycon_kind = foldr (mkArrowKind . getTyVarKind) result_kind rec_tyvars + result_kind = typeKind rhs_ty + final_tycon_kind = foldr (mkArrowKind . tyVarKind) result_kind rec_tyvars -- Construct the tycon tycon = mkSynTyCon (getName tycon_name) @@ -138,7 +144,7 @@ tcTyDataOrNew data_or_new context tycon_name tyvar_names con_decls derivings pra let -- Construct the tycon final_tycon_kind :: Kind -- NB not TcKind! - final_tycon_kind = foldr (mkArrowKind . getTyVarKind) mkBoxedTypeKind rec_tyvars + final_tycon_kind = foldr (mkArrowKind . tyVarKind) mkBoxedTypeKind rec_tyvars tycon = mkDataTyCon (getName tycon_name) final_tycon_kind @@ -162,15 +168,22 @@ Generating constructor/selector bindings for data declarations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \begin{code} -mkDataBinds :: TyCon -> TcM s ([Id], TcHsBinds s) -mkDataBinds tycon - = ASSERT( isDataTyCon tycon ) +mkDataBinds :: [TyCon] -> TcM s ([Id], TcHsBinds s) +mkDataBinds [] = returnTc ([], EmptyBinds) +mkDataBinds (tycon : tycons) + | isSynTyCon tycon = mkDataBinds tycons + | otherwise = mkDataBinds_one tycon `thenTc` \ (ids1, b1) -> + mkDataBinds tycons `thenTc` \ (ids2, b2) -> + returnTc (ids1++ids2, b1 `ThenBinds` b2) + +mkDataBinds_one tycon + = ASSERT( isDataTyCon tycon || isNewTyCon tycon ) mapAndUnzipTc mkConstructor data_cons `thenTc` \ (con_ids, con_binds) -> mapAndUnzipTc (mkRecordSelector tycon) groups `thenTc` \ (sel_ids, sel_binds) -> returnTc (con_ids ++ sel_ids, SingleBind $ NonRecBind $ foldr AndMonoBinds - (foldr AndMonoBinds EmptyMonoBinds con_binds) + (foldr AndMonoBinds EmptyMonoBinds sel_binds) con_binds ) where @@ -193,7 +206,7 @@ We're going to build a constructor that looks like: \d1::Data a, d2::C b -> \p q r -> case p of { p -> case q of { q -> - HsCon [a,b,c] [p,q,r]}} + HsCon T1 [a,b] [p,q,r]}} Notice that @@ -215,49 +228,48 @@ mkConstructor con_id = returnTc (con_id, EmptyMonoBinds) | otherwise -- It is locally defined - = tcInstId con_id `thenNF_Tc` \ (tyvars, theta, tau) -> - newDicts DataDeclOrigin theta `thenNF_Tc` \ (_, dicts) -> + = tcInstId con_id `thenNF_Tc` \ (tc_tyvars, tc_theta, tc_tau) -> + newDicts DataDeclOrigin tc_theta `thenNF_Tc` \ (_, dicts) -> let - (arg_tys, result_ty) = splitFunTy tau - n_args = length arg_tys + (tc_arg_tys, tc_result_ty) = splitFunTy tc_tau + n_args = length tc_arg_tys in - newLocalIds (take n_args (repeat SLIT("con"))) arg_tys `thenNF_Tc` {- \ pre_zonk_args -> - mapNF_Tc zonkId pre_zonk_args `thenNF_Tc` -} \ args -> + newLocalIds (nOfThem n_args SLIT("con")) tc_arg_tys `thenNF_Tc` \ args -> - -- Check that all the types of all the strict - -- arguments are in Data. This is trivially true of everything except - -- type variables, for which we must check the context. + -- Check that all the types of all the strict arguments are in Eval + tcLookupClassByKey evalClassKey `thenNF_Tc` \ eval_clas -> let - strict_marks = dataConStrictMarks con_id - strict_args = [arg | (arg, MarkedStrict) <- args `zipEqual` strict_marks] - - data_tyvars = -- The tyvars in the constructor's context that are arguments - -- to the Data class - [getTyVar "mkConstructor" ty - | (clas,ty) <- theta, - uniqueOf clas == dataClassKey] - - check_data arg = case getTyVar_maybe (tcIdType arg) of - Nothing -> returnTc () -- Not a tyvar, so OK - Just tyvar -> checkTc (tyvar `elem` data_tyvars) (missingDataErr tyvar) + (_,theta,tau) = splitSigmaTy (idType con_id) + (arg_tys, _) = splitFunTy tau + strict_marks = dataConStrictMarks con_id + eval_theta = [ (eval_clas,arg_ty) + | (arg_ty, MarkedStrict) <- zipEqual "strict_args" + arg_tys strict_marks + ] in - mapTc check_data strict_args `thenTc_` + tcSimplifyThetas classInstEnv theta eval_theta `thenTc` \ eval_theta' -> + checkTc (null eval_theta') + (missingEvalErr con_id eval_theta') `thenTc_` -- Build the data constructor let - con_rhs = mkHsTyLam tyvars $ + con_rhs = mkHsTyLam tc_tyvars $ mkHsDictLam dicts $ mk_pat_match args $ - mk_case strict_args $ - HsCon con_id arg_tys (map HsVar args) + mk_case (zipEqual "strict_args" args strict_marks) $ + HsCon con_id (mkTyVarTys tc_tyvars) (map HsVar args) mk_pat_match [] body = body - mk_pat_match (arg:args) body = HsLam (PatMatch (VarPat arg) (SimpleMatch (mk_pat_match args body))) + mk_pat_match (arg:args) body = HsLam $ + PatMatch (VarPat arg) $ + SimpleMatch (mk_pat_match args body) mk_case [] body = body - mk_case (arg:args) body = HsCase (HsVar arg) - [PatMatch (VarPat arg) (SimpleMatch (mk_case args body))] - src_loc + mk_case ((arg,MarkedStrict):args) body = HsCase (HsVar arg) + [PatMatch (VarPat arg) $ + SimpleMatch (mk_case args body)] + src_loc + mk_case (_:args) body = mk_case args body src_loc = nameSrcLoc (getName con_id) in @@ -324,7 +336,7 @@ mkRecordSelector tycon fields@((first_con, first_field_label) : other_fields) selector_body = HsCase (HsVar record_id) (map mk_match fields) (getSrcLoc tycon) mk_match (con_id, field_label) - = PatMatch (RecPat con_id data_ty' [(RealId selector_id, VarPat field_id, False)]) $ + = PatMatch (RecPat con_id data_ty' [(selector_id, VarPat field_id, False)]) $ SimpleMatch $ HsVar field_id in @@ -368,8 +380,7 @@ tcConDecl tycon tyvars ctxt (RecConDecl name fields src_loc) arg_tys = [ty | (_, ty, _) <- field_label_infos] field_labels = [ mkFieldLabel (getName name) ty tag - | ((name, ty, _), tag) <- field_label_infos `zip` allFieldLabelTags - ] + | ((name, ty, _), tag) <- field_label_infos `zip` allFieldLabelTags ] data_con = mkDataCon (getName name) stricts @@ -383,16 +394,16 @@ tcConDecl tycon tyvars ctxt (RecConDecl name fields src_loc) returnTc data_con tcField (field_label_names, bty) - = tcMonoType (get_ty bty) `thenTc` \ field_ty -> + = tcPolyType (get_pty bty) `thenTc` \ field_ty -> returnTc [(name, field_ty, get_strictness bty) | name <- field_label_names] tcDataCon tycon tyvars ctxt name btys src_loc = tcAddSrcLoc src_loc $ let stricts = map get_strictness btys - tys = map get_ty btys + tys = map get_pty btys in - mapTc tcMonoType tys `thenTc` \ arg_tys -> + mapTc tcPolyType tys `thenTc` \ arg_tys -> let data_con = mkDataCon (getName name) stricts @@ -413,11 +424,11 @@ thinContext arg_tys ctxt arg_tyvars = tyVarsOfTypes arg_tys in_arg_tys (clas,ty) = getTyVar "tcDataCon" ty `elementOfTyVarSet` arg_tyvars -get_strictness (Banged ty) = MarkedStrict -get_strictness (Unbanged ty) = NotMarkedStrict +get_strictness (Banged _) = MarkedStrict +get_strictness (Unbanged _) = NotMarkedStrict -get_ty (Banged ty) = ty -get_ty (Unbanged ty) = ty +get_pty (Banged ty) = ty +get_pty (Unbanged ty) = ty \end{code} @@ -437,6 +448,8 @@ tyNewCtxt tycon_name sty fieldTypeMisMatch field_name sty = ppSep [ppStr "Declared types differ for field", ppr sty field_name] -missingDataErr tyvar sty - = ppStr "Missing `data' (???)" -- ToDo: improve +missingEvalErr con eval_theta sty + = ppCat [ppStr "Missing Eval context for constructor", + ppQuote (ppr sty con), + ppStr ":", ppr sty eval_theta] \end{code}