X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Ftypecheck%2FTcTyClsDecls.lhs;h=8d575dae29c894be730b365165cb4b42d1a8870c;hb=4166dff80e8ec94022a040318ff2759913fbbe06;hp=ae7e4d2ee7ff1804be2648cf4c3f78e81894554d;hpb=a180ee15dfe2eb0da03cd92ca89475765cd080d9;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs index ae7e4d2..8d575da 100644 --- a/ghc/compiler/typecheck/TcTyClsDecls.lhs +++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs @@ -10,19 +10,19 @@ module TcTyClsDecls ( #include "HsVersions.h" -import HsSyn ( HsDecl(..), TyClDecl(..), - HsType(..), HsTyVarBndr, - ConDecl(..), ConDetails(..), - Sig(..), HsPred(..), HsTupCon(..), - tyClDeclName, hsTyVarNames, isClassDecl, isSynDecl, isClassOpSig, getBangType +import CmdLineOpts ( DynFlags, DynFlag(..), dopt ) +import HsSyn ( TyClDecl(..), HsTyVarBndr, + ConDecl(..), Sig(..), HsPred(..), + tyClDeclName, hsTyVarNames, + isIfaceSigDecl, isClassDecl, isSynDecl, isClassOpSig ) -import RnHsSyn ( RenamedHsDecl, RenamedTyClDecl, listTyCon_name ) -import BasicTypes ( RecFlag(..), NewOrData(..) ) +import RnHsSyn ( RenamedTyClDecl, tyClDeclFVs ) +import BasicTypes ( RecFlag(..), NewOrData(..), isRec ) +import HscTypes ( implicitTyThingIds ) import TcMonad -import TcEnv ( TcEnv, TyThing(..), TyThingDetails(..), tyThingKind, - tcExtendTypeEnv, tcExtendKindEnv, tcLookupGlobal - ) +import TcEnv ( TcEnv, RecTcEnv, TcTyThing(..), TyThing(..), TyThingDetails(..), + tcExtendKindEnv, tcLookup, tcExtendGlobalEnv, tcExtendGlobalValEnv ) import TcTyDecls ( tcTyDecl1, kcConDetails, mkNewTyConRep ) import TcClassDcl ( tcClassDecl1 ) import TcMonoType ( kcHsTyVars, kcHsType, kcHsBoxedSigType, kcHsContext, mkTyClTyVars ) @@ -33,21 +33,19 @@ import TcInstDcls ( tcAddDeclCtxt ) import Type ( Kind, mkArrowKind, boxedTypeKind, zipFunTys ) import Variance ( calcTyConArgVrcs ) import Class ( Class, mkClass, classTyCon ) -import TyCon ( TyCon, ArgVrcs, AlgTyConFlavour(..), mkSynTyCon, mkAlgTyConRep, mkClassTyCon ) +import TyCon ( TyCon, tyConKind, ArgVrcs, AlgTyConFlavour(..), + mkSynTyCon, mkAlgTyCon, mkClassTyCon ) import DataCon ( isNullaryDataCon ) import Var ( varName ) import FiniteMap import Digraph ( stronglyConnComp, SCC(..) ) -import Name ( Name, NamedThing(..), NameEnv, getSrcLoc, isTvOcc, nameOccName, - mkNameEnv, lookupNameEnv_NF - ) +import Name ( Name, getSrcLoc, isTyVarName ) +import Name ( NameEnv, mkNameEnv, lookupNameEnv_NF ) +import NameSet import Outputable -import Maybes ( mapMaybe, catMaybes ) -import UniqSet ( emptyUniqSet, unitUniqSet, unionUniqSets, - unionManyUniqSets, uniqSetToList ) +import Maybes ( mapMaybe ) import ErrUtils ( Message ) -import Unique ( Unique, Uniquable(..) ) -import HsDecls ( fromClassDeclNameList ) +import HsDecls ( getClassDeclSysNames ) import Generics ( mkTyConGenInfo ) \end{code} @@ -61,8 +59,8 @@ import Generics ( mkTyConGenInfo ) The main function ~~~~~~~~~~~~~~~~~ \begin{code} -tcTyAndClassDecls :: TcEnv -- Knot tying stuff - -> [RenamedHsDecl] +tcTyAndClassDecls :: RecTcEnv -- Knot tying stuff + -> [RenamedTyClDecl] -> TcM TcEnv tcTyAndClassDecls unf_env decls @@ -75,7 +73,7 @@ tcGroups unf_env [] tcGroups unf_env (group:groups) = tcGroup unf_env group `thenTc` \ env -> - tcSetEnv env $ + tcSetEnv env $ tcGroups unf_env groups \end{code} @@ -104,16 +102,29 @@ Step 4: buildTyConOrClass Step 5: tcTyClDecl1 In this environment, walk over the decls, constructing the TyCons and Classes. This uses in a strict way items (a)-(c) above, which is why they must - be constructed in Step 4. - Feed the results back to Step 4. + be constructed in Step 4. Feed the results back to Step 4. + For this step, pass the is-recursive flag as the wimp-out flag + to tcTyClDecl1. + +Step 6: tcTyClDecl1 again + For a recursive group only, check all the decls again, just + but this time with the wimp flag off. Now we can check things + like whether a function argument is an unboxed tuple, looking + through type synonyms properly. We can't do that in Step 5. + +Step 7: Extend environment + We extend the type environment with bindings not only for the TyCons and Classes, + but also for their "implicit Ids" like data constructors and class selectors + The knot-tying parameters: @rec_details_list@ is an alist mapping @Name@s to @TyThing@s. @rec_vrcs@ is a finite map from @Name@s to @ArgVrcs@s. \begin{code} -tcGroup :: TcEnv -> SCC RenamedTyClDecl -> TcM TcEnv +tcGroup :: RecTcEnv -> SCC RenamedTyClDecl -> TcM TcEnv tcGroup unf_env scc - = -- Step 1 + = getDOptsTc `thenTc` \ dflags -> + -- Step 1 mapNF_Tc getInitialKind decls `thenNF_Tc` \ initial_kinds -> -- Step 2 @@ -123,32 +134,50 @@ tcGroup unf_env scc zonkKindEnv initial_kinds `thenNF_Tc` \ final_kinds -> -- Tie the knot - fixTc ( \ ~(rec_details_list, _) -> + fixTc ( \ ~(rec_details_list, _, _) -> -- Step 4 let kind_env = mkNameEnv final_kinds rec_details = mkNameEnv rec_details_list - tyclss, all_tyclss :: [(Name, TyThing)] - tyclss = map (buildTyConOrClass is_rec kind_env rec_vrcs rec_details) decls + tyclss, all_tyclss :: [TyThing] + tyclss = map (buildTyConOrClass dflags is_rec kind_env + rec_vrcs rec_details) decls -- Add the tycons that come from the classes -- We want them in the environment because -- they are mentioned in interface files - all_tyclss = [ (getName tycon, ATyCon tycon) | (_, AClass clas) <- tyclss, - let tycon = classTyCon clas - ] ++ tyclss + all_tyclss = [ ATyCon (classTyCon clas) | AClass clas <- tyclss] + ++ tyclss -- Calculate variances, and (yes!) feed back into buildTyConOrClass. - rec_vrcs = calcTyConArgVrcs [tc | (_, ATyCon tc) <- all_tyclss] + rec_vrcs = calcTyConArgVrcs [tc | ATyCon tc <- all_tyclss] in -- Step 5 - tcExtendGlobalEnv all_tyclss $ - mapTc (tcTyClDecl1 unf_env) decls `thenTc` \ tycls_details -> - tcGetEnv `thenNF_Tc` \ env -> - returnTc (tycls_details, env) - ) `thenTc` \ (_, env) -> - returnTc env + tcExtendGlobalEnv all_tyclss $ + mapTc (tcTyClDecl1 is_rec unf_env) decls `thenTc` \ tycls_details -> + + -- Return results + tcGetEnv `thenNF_Tc` \ env -> + returnTc (tycls_details, all_tyclss, env) + ) `thenTc` \ (_, all_tyclss, env) -> + + tcSetEnv env $ + + -- Step 6 + -- For a recursive group, check all the types again, + -- this time with the wimp flag off + (if isRec is_rec then + mapTc_ (tcTyClDecl1 NonRecursive unf_env) decls + else + returnTc () + ) `thenTc_` + + -- Step 7 + -- Extend the environment with the final TyCons/Classes + -- and their implicit Ids + tcExtendGlobalValEnv (implicitTyThingIds all_tyclss) tcGetEnv + where is_rec = case scc of AcyclicSCC _ -> NonRecursive @@ -158,12 +187,9 @@ tcGroup unf_env scc AcyclicSCC decl -> [decl] CyclicSCC decls -> decls -tcTyClDecl1 unf_env decl - = tcAddDeclCtxt decl $ - if isClassDecl decl then - tcClassDecl1 unf_env decl - else - tcTyDecl1 decl +tcTyClDecl1 is_rec unf_env decl + | isClassDecl decl = tcAddDeclCtxt decl (tcClassDecl1 is_rec unf_env decl) + | otherwise = tcAddDeclCtxt decl (tcTyDecl1 is_rec unf_env decl) \end{code} @@ -180,11 +206,11 @@ getInitialKind (TySynonym name tyvars _ _) newKindVar `thenNF_Tc` \ result_kind -> returnNF_Tc (name, mk_kind arg_kinds result_kind) -getInitialKind (TyData _ _ name tyvars _ _ _ _ _ _ _) +getInitialKind (TyData _ _ name tyvars _ _ _ _ _ _) = kcHsTyVars tyvars `thenNF_Tc` \ arg_kinds -> returnNF_Tc (name, mk_kind arg_kinds boxedTypeKind) -getInitialKind (ClassDecl _ name tyvars _ _ _ _ _ _ ) +getInitialKind (ClassDecl _ name tyvars _ _ _ _ _ ) = kcHsTyVars tyvars `thenNF_Tc` \ arg_kinds -> returnNF_Tc (name, mk_kind arg_kinds boxedTypeKind) @@ -220,7 +246,7 @@ kcTyClDecl decl@(TySynonym tycon_name hs_tyvars rhs loc) kcHsType rhs `thenTc` \ rhs_kind -> unifyKind result_kind rhs_kind -kcTyClDecl decl@(TyData _ context tycon_name hs_tyvars con_decls _ _ _ loc _ _) +kcTyClDecl decl@(TyData new_or_data context tycon_name hs_tyvars con_decls _ _ loc _ _) = tcAddDeclCtxt decl $ kcTyClDeclBody tycon_name hs_tyvars $ \ result_kind -> kcHsContext context `thenTc_` @@ -230,11 +256,11 @@ kcTyClDecl decl@(TyData _ context tycon_name hs_tyvars con_decls _ _ _ loc _ _) = tcAddSrcLoc loc $ kcHsTyVars ex_tvs `thenNF_Tc` \ kind_env -> tcExtendKindEnv kind_env $ - kcConDetails ex_ctxt details + kcConDetails new_or_data ex_ctxt details kcTyClDecl decl@(ClassDecl context class_name hs_tyvars fundeps class_sigs - _ _ _ loc) + _ _ loc) = tcAddDeclCtxt decl $ kcTyClDeclBody class_name hs_tyvars $ \ result_kind -> kcHsContext context `thenTc_` @@ -249,11 +275,12 @@ kcTyClDeclBody :: Name -> [HsTyVarBndr Name] -- Kind of the tycon/cls and its t -- the kind of the tycon/class. Give it to the thing inside, and -- check the result kind matches kcTyClDeclBody tc_name hs_tyvars thing_inside - = tcLookupGlobal tc_name `thenNF_Tc` \ thing -> + = tcLookup tc_name `thenNF_Tc` \ thing -> let kind = case thing of - ATyCon tc -> tyConKind tc - AClass cl -> tyConKind (classTyCon cl) + AGlobal (ATyCon tc) -> tyConKind tc + AGlobal (AClass cl) -> tyConKind (classTyCon cl) + AThing kind -> kind -- For some odd reason, a class doesn't include its kind (tyvars_w_kinds, result_kind) = zipFunTys (hsTyVarNames hs_tyvars) kind @@ -270,15 +297,14 @@ kcTyClDeclBody tc_name hs_tyvars thing_inside \begin{code} buildTyConOrClass - :: RecFlag -> NameEnv Kind + :: DynFlags + -> RecFlag -> NameEnv Kind -> FiniteMap TyCon ArgVrcs -> NameEnv TyThingDetails - -> RenamedTyClDecl -> (Name, TyThing) - -- Can't fail; the only reason it's in the monad - -- is so it can zonk the kinds + -> RenamedTyClDecl -> TyThing -buildTyConOrClass is_rec kenv rec_vrcs rec_details +buildTyConOrClass dflags is_rec kenv rec_vrcs rec_details (TySynonym tycon_name tyvar_names rhs src_loc) - = (tycon_name, ATyCon tycon) + = ATyCon tycon where tycon = mkSynTyCon tycon_name tycon_kind arity tyvars rhs_ty argvrcs tycon_kind = lookupNameEnv_NF kenv tycon_name @@ -287,17 +313,18 @@ buildTyConOrClass is_rec kenv rec_vrcs rec_details SynTyDetails rhs_ty = lookupNameEnv_NF rec_details tycon_name argvrcs = lookupWithDefaultFM rec_vrcs bogusVrcs tycon -buildTyConOrClass is_rec kenv rec_vrcs rec_details - (TyData data_or_new context tycon_name tyvar_names _ nconstrs _ _ src_loc name1 name2) - = (tycon_name, ATyCon tycon) +buildTyConOrClass dflags is_rec kenv rec_vrcs rec_details + (TyData data_or_new context tycon_name tyvar_names _ nconstrs _ src_loc name1 name2) + = ATyCon tycon where - tycon = mkAlgTyConRep tycon_name tycon_kind tyvars ctxt argvrcs - data_cons nconstrs - derived_classes + tycon = mkAlgTyCon tycon_name tycon_kind tyvars ctxt argvrcs + data_cons nconstrs sel_ids flavour is_rec gen_info - gen_info = mkTyConGenInfo tycon name1 name2 - DataTyDetails ctxt data_cons derived_classes = lookupNameEnv_NF rec_details tycon_name + gen_info | not (dopt Opt_Generics dflags) = Nothing + | otherwise = mkTyConGenInfo tycon name1 name2 + + DataTyDetails ctxt data_cons sel_ids = lookupNameEnv_NF rec_details tycon_name tycon_kind = lookupNameEnv_NF kenv tycon_name tyvars = mkTyClTyVars tycon_kind tyvar_names @@ -308,13 +335,13 @@ buildTyConOrClass is_rec kenv rec_vrcs rec_details DataType | all isNullaryDataCon data_cons -> EnumTyCon | otherwise -> DataTyCon -buildTyConOrClass is_rec kenv rec_vrcs rec_details +buildTyConOrClass dflags is_rec kenv rec_vrcs rec_details (ClassDecl context class_name - tyvar_names fundeps class_sigs def_methods pragmas + tyvar_names fundeps class_sigs def_methods name_list src_loc) - = (class_name, AClass clas) + = AClass clas where - (tycon_name, _, _, _) = fromClassDeclNameList name_list + (tycon_name, _, _, _) = getClassDeclSysNames name_list clas = mkClass class_name tyvars fds sc_theta sc_sel_ids op_items tycon @@ -355,10 +382,10 @@ bogusVrcs = panic "Bogus tycon arg variances" Dependency analysis ~~~~~~~~~~~~~~~~~~~ \begin{code} -sortByDependency :: [RenamedHsDecl] -> TcM [SCC RenamedTyClDecl] +sortByDependency :: [RenamedTyClDecl] -> TcM [SCC RenamedTyClDecl] sortByDependency decls = let -- CHECK FOR CLASS CYCLES - cls_sccs = stronglyConnComp (mapMaybe mk_cls_edges tycl_decls) + cls_sccs = stronglyConnComp (mapMaybe mkClassEdges tycl_decls) cls_cycles = [ decls | CyclicSCC decls <- cls_sccs] in checkTc (null cls_cycles) (classCycleErr cls_cycles) `thenTc_` @@ -376,8 +403,8 @@ sortByDependency decls in returnTc decl_sccs where - tycl_decls = [d | TyClD d <- decls] - edges = map mk_edges tycl_decls + tycl_decls = filter (not . isIfaceSigDecl) decls + edges = map mkEdges tycl_decls is_syn_decl (d, _, _) = isSynDecl d \end{code} @@ -386,84 +413,25 @@ Edges in Type/Class decls ~~~~~~~~~~~~~~~~~~~~~~~~~ \begin{code} +tyClDeclFTVs :: RenamedTyClDecl -> [Name] + -- Find the free non-tyvar vars +tyClDeclFTVs d = foldNameSet add [] (tyClDeclFVs d) + where + add n fvs | isTyVarName n = fvs + | otherwise = n : fvs + ---------------------------------------------------- -- mk_cls_edges looks only at the context of class decls -- Its used when we are figuring out if there's a cycle in the -- superclass hierarchy -mk_cls_edges :: RenamedTyClDecl -> Maybe (RenamedTyClDecl, Unique, [Unique]) - -mk_cls_edges decl@(ClassDecl ctxt name _ _ _ _ _ _ _) - = Just (decl, getUnique name, map getUnique (catMaybes (map get_clas ctxt))) -mk_cls_edges other_decl - = Nothing - ----------------------------------------------------- -mk_edges :: RenamedTyClDecl -> (RenamedTyClDecl, Unique, [Unique]) - -mk_edges decl@(TyData _ ctxt name _ condecls _ derivs _ _ _ _) - = (decl, getUnique name, uniqSetToList (get_ctxt ctxt `unionUniqSets` - get_cons condecls `unionUniqSets` - get_deriv derivs)) +mkClassEdges :: RenamedTyClDecl -> Maybe (RenamedTyClDecl, Name, [Name]) -mk_edges decl@(TySynonym name _ rhs _) - = (decl, getUnique name, uniqSetToList (get_ty rhs)) - -mk_edges decl@(ClassDecl ctxt name _ _ sigs _ _ _ _) - = (decl, getUnique name, uniqSetToList (get_ctxt ctxt `unionUniqSets` - get_sigs sigs)) - - ----------------------------------------------------- -get_ctxt ctxt = unionManyUniqSets (map set_name (catMaybes (map get_clas ctxt))) -get_clas (HsPClass clas _) = Just clas -get_clas _ = Nothing +mkClassEdges decl@(ClassDecl ctxt name _ _ _ _ _ _) = Just (decl, name, [c | HsPClass c _ <- ctxt]) +mkClassEdges other_decl = Nothing ----------------------------------------------------- -get_deriv Nothing = emptyUniqSet -get_deriv (Just clss) = unionManyUniqSets (map set_name clss) - ----------------------------------------------------- -get_cons cons = unionManyUniqSets (map get_con cons) - ----------------------------------------------------- -get_con (ConDecl _ _ _ ctxt details _) - = get_ctxt ctxt `unionUniqSets` get_con_details details - ----------------------------------------------------- -get_con_details (VanillaCon btys) = unionManyUniqSets (map get_bty btys) -get_con_details (InfixCon bty1 bty2) = unionUniqSets (get_bty bty1) (get_bty bty2) -get_con_details (RecCon nbtys) = unionManyUniqSets (map (get_bty.snd) nbtys) - ----------------------------------------------------- -get_bty bty = get_ty (getBangType bty) - ----------------------------------------------------- -get_ty (HsTyVar name) | isTvOcc (nameOccName name) = emptyUniqSet - | otherwise = set_name name -get_ty (HsAppTy ty1 ty2) = unionUniqSets (get_ty ty1) (get_ty ty2) -get_ty (HsFunTy ty1 ty2) = unionUniqSets (get_ty ty1) (get_ty ty2) -get_ty (HsListTy ty) = set_name listTyCon_name `unionUniqSets` get_ty ty -get_ty (HsTupleTy (HsTupCon n _) tys) = set_name n `unionUniqSets` get_tys tys -get_ty (HsUsgTy _ ty) = get_ty ty -get_ty (HsUsgForAllTy _ ty) = get_ty ty -get_ty (HsForAllTy _ ctxt mty) = get_ctxt ctxt `unionUniqSets` get_ty mty -get_ty (HsPredTy (HsPClass name _)) = set_name name -get_ty (HsPredTy (HsPIParam _ _)) = emptyUniqSet -- I think - ----------------------------------------------------- -get_tys tys = unionManyUniqSets (map get_ty tys) - ----------------------------------------------------- -get_sigs sigs - = unionManyUniqSets (map get_sig sigs) - where - get_sig (ClassOpSig _ _ ty _) = get_ty ty - get_sig (FixSig _) = emptyUniqSet - get_sig other = panic "TcTyClsDecls:get_sig" - ----------------------------------------------------- -set_name name = unitUniqSet (getUnique name) +mkEdges :: RenamedTyClDecl -> (RenamedTyClDecl, Name, [Name]) +mkEdges decl = (decl, tyClDeclName decl, tyClDeclFTVs decl) \end{code}