#include "HsVersions.h"
import HsSyn ( HsDecl(..), TyClDecl(..),
- HsType(..), HsTyVarBndr,
- ConDecl(..), ConDetails(..),
- Sig(..), HsPred(..), HsTupCon(..),
- tyClDeclName, hsTyVarNames, isClassDecl, isSynDecl, isClassOpSig, getBangType
+ HsTyVarBndr,
+ ConDecl(..),
+ Sig(..), HsPred(..),
+ tyClDeclName, hsTyVarNames,
+ isIfaceSigDecl, isClassDecl, isSynDecl, isClassOpSig
)
-import RnHsSyn ( RenamedHsDecl, RenamedTyClDecl, listTyCon_name )
+import RnHsSyn ( RenamedHsDecl, RenamedTyClDecl, tyClDeclFVs )
import BasicTypes ( RecFlag(..), NewOrData(..) )
import TcMonad
-import TcEnv ( ValueEnv, TyThing(..), TyThingDetails(..), tyThingKind,
- tcExtendTypeEnv, tcExtendKindEnv, tcLookupTy
- )
+import TcEnv ( TcEnv, TcTyThing(..), TyThing(..), TyThingDetails(..),
+ tcExtendKindEnv, tcLookup, tcExtendGlobalEnv )
import TcTyDecls ( tcTyDecl1, kcConDetails, mkNewTyConRep )
import TcClassDcl ( tcClassDecl1 )
import TcMonoType ( kcHsTyVars, kcHsType, kcHsBoxedSigType, kcHsContext, mkTyClTyVars )
import TcType ( TcKind, newKindVar, zonkKindEnv )
import TcUnify ( unifyKind )
+import TcInstDcls ( tcAddDeclCtxt )
import Type ( Kind, mkArrowKind, boxedTypeKind, zipFunTys )
import Variance ( calcTyConArgVrcs )
import Class ( Class, mkClass, classTyCon )
-import TyCon ( TyCon, ArgVrcs, AlgTyConFlavour(..), mkSynTyCon, mkAlgTyCon, mkClassTyCon )
+import TyCon ( TyCon, tyConKind, ArgVrcs, AlgTyConFlavour(..),
+ mkSynTyCon, mkAlgTyConRep, 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, NamedThing(..), NameEnv, getSrcLoc,
+ mkNameEnv, lookupNameEnv_NF, isTyVarName
)
+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 ( getClassDeclSysNames )
+import Generics ( mkTyConGenInfo )
+import CmdLineOpts ( DynFlags )
\end{code}
The main function
~~~~~~~~~~~~~~~~~
\begin{code}
-tcTyAndClassDecls :: ValueEnv -- Knot tying stuff
+tcTyAndClassDecls :: TcEnv -- Knot tying stuff
-> [RenamedHsDecl]
- -> TcM s TcEnv
+ -> TcM TcEnv
tcTyAndClassDecls unf_env decls
= sortByDependency decls `thenTc` \ groups ->
Dealing with a group
~~~~~~~~~~~~~~~~~~~~
-
Consider a mutually-recursive group, binding
a type constructor T and a class C.
@TyThing@s. @rec_vrcs@ is a finite map from @Name@s to @ArgVrcs@s.
\begin{code}
-tcGroup :: ValueEnv -> SCC RenamedTyClDecl -> TcM s TcEnv
+tcGroup :: TcEnv -> 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
rec_details = mkNameEnv rec_details_list
tyclss, all_tyclss :: [(Name, TyThing)]
- tyclss = map (buildTyConOrClass is_rec kind_env rec_vrcs rec_details) decls
+ 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
rec_vrcs = calcTyConArgVrcs [tc | (_, ATyCon tc) <- all_tyclss]
in
-- Step 5
- tcExtendTypeEnv all_tyclss $
+ tcExtendGlobalEnv all_tyclss $
mapTc (tcTyClDecl1 unf_env) decls `thenTc` \ tycls_details ->
tcGetEnv `thenNF_Tc` \ env ->
returnTc (tycls_details, env)
- ) `thenTc` \ (_, env) ->
+ ) `thenTc` \ (_, env) ->
returnTc env
where
is_rec = case scc of
AcyclicSCC decl -> [decl]
CyclicSCC decls -> decls
-tcTyClDecl1 :: ValueEnv -> RenamedTyClDecl -> TcM s (Name, TyThingDetails)
-
tcTyClDecl1 unf_env decl
= tcAddDeclCtxt decl $
if isClassDecl decl then
%************************************************************************
\begin{code}
-getInitialKind :: RenamedTyClDecl -> NF_TcM s (Name, TcKind)
+getInitialKind :: RenamedTyClDecl -> NF_TcM (Name, TcKind)
getInitialKind (TySynonym name tyvars _ _)
= kcHsTyVars tyvars `thenNF_Tc` \ arg_kinds ->
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)
Monad c in bop's type signature means that D must have kind Type->Type.
\begin{code}
-kcTyClDecl :: RenamedTyClDecl -> TcM s ()
+kcTyClDecl :: RenamedTyClDecl -> TcM ()
kcTyClDecl decl@(TySynonym tycon_name hs_tyvars rhs loc)
= tcAddDeclCtxt decl $
kcHsType rhs `thenTc` \ rhs_kind ->
unifyKind result_kind rhs_kind
-kcTyClDecl decl@(TyData _ context tycon_name hs_tyvars con_decls _ _ _ loc)
+kcTyClDecl decl@(TyData _ context tycon_name hs_tyvars con_decls _ _ loc _ _)
= tcAddDeclCtxt decl $
kcTyClDeclBody tycon_name hs_tyvars $ \ result_kind ->
kcHsContext context `thenTc_`
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_`
kc_sig (ClassOpSig _ _ op_ty loc) = tcAddSrcLoc loc (kcHsBoxedSigType op_ty)
kcTyClDeclBody :: Name -> [HsTyVarBndr Name] -- Kind of the tycon/cls and its tyvars
- -> (Kind -> TcM s a) -- Thing inside
- -> TcM s a
+ -> (Kind -> TcM a) -- Thing inside
+ -> TcM a
-- Extend the env with bindings for the tyvars, taken from
-- 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
- = tcLookupTy tc_name `thenNF_Tc` \ tc ->
+ = tcLookup tc_name `thenNF_Tc` \ thing ->
let
- (tyvars_w_kinds, result_kind) = zipFunTys (hsTyVarNames hs_tyvars) (tyThingKind tc)
+ kind = case thing of
+ 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
in
tcExtendKindEnv tyvars_w_kinds (thing_inside result_kind)
\end{code}
\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
-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)
where
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)
+buildTyConOrClass dflags 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)
where
- tycon = mkAlgTyCon tycon_name tycon_kind tyvars ctxt argvrcs
+ tycon = mkAlgTyConRep tycon_name tycon_kind tyvars ctxt argvrcs
data_cons nconstrs
derived_classes
- flavour is_rec
+ flavour is_rec gen_info
+ gen_info = mkTyConGenInfo dflags tycon name1 name2
DataTyDetails ctxt data_cons derived_classes = lookupNameEnv_NF rec_details tycon_name
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
- tycon_name datacon_name datacon_wkr_name sc_sel_names src_loc)
+ tyvar_names fundeps class_sigs def_methods
+ name_list src_loc)
= (class_name, AClass clas)
where
+ (tycon_name, _, _, _) = getClassDeclSysNames name_list
clas = mkClass class_name tyvars fds
sc_theta sc_sel_ids op_items
tycon
Dependency analysis
~~~~~~~~~~~~~~~~~~~
\begin{code}
-sortByDependency :: [RenamedHsDecl] -> TcM s [SCC RenamedTyClDecl]
+sortByDependency :: [RenamedHsDecl] -> 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_`
in
returnTc decl_sccs
where
- tycl_decls = [d | TyClD d <- decls]
- edges = map mk_edges tycl_decls
+ tycl_decls = [d | TyClD d <- decls, not (isIfaceSigDecl d)]
+ edges = map mkEdges tycl_decls
is_syn_decl (d, _, _) = isSynDecl d
\end{code}
~~~~~~~~~~~~~~~~~~~~~~~~~
\begin{code}
+tyClDeclFTVs :: RenamedTyClDecl -> [Name]
+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
-
-----------------------------------------------------
-get_deriv Nothing = emptyUniqSet
-get_deriv (Just clss) = unionManyUniqSets (map set_name clss)
-
-----------------------------------------------------
-get_cons cons = unionManyUniqSets (map get_con cons)
+mkClassEdges decl@(ClassDecl ctxt name _ _ _ _ _ _) = Just (decl, name, [c | HsPClass c _ <- ctxt])
+mkClassEdges other_decl = Nothing
----------------------------------------------------
-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}
%************************************************************************
\begin{code}
-tcAddDeclCtxt decl thing_inside
- = tcAddSrcLoc loc $
- tcAddErrCtxt ctxt $
- thing_inside
- where
- (name, loc, thing)
- = case decl of
- (ClassDecl _ name _ _ _ _ _ _ _ _ _ loc) -> (name, loc, "class")
- (TySynonym name _ _ loc) -> (name, loc, "type synonym")
- (TyData NewType _ name _ _ _ _ _ loc) -> (name, loc, "newtype")
- (TyData DataType _ name _ _ _ _ _ loc) -> (name, loc, "data type")
-
- ctxt = hsep [ptext SLIT("In the"), text thing,
- ptext SLIT("declaration for"), quotes (ppr name)]
-\end{code}
-
-\begin{code}
typeCycleErr, classCycleErr :: [[RenamedTyClDecl]] -> Message
typeCycleErr syn_cycles
projects / ghc-hetmet.git / blobdiff