#include "HsVersions.h"
-import HsSyn ( HsDecl(..), TyClDecl(..),
- HsTyVarBndr,
- ConDecl(..),
- Sig(..), HsPred(..),
+import CmdLineOpts ( DynFlags, DynFlag(..), dopt )
+import HsSyn ( TyClDecl(..),
+ ConDecl(..), Sig(..), HsPred(..),
tyClDeclName, hsTyVarNames,
isIfaceSigDecl, isClassDecl, isSynDecl, isClassOpSig
)
-import RnHsSyn ( RenamedHsDecl, RenamedTyClDecl, tyClDeclFVs )
-import BasicTypes ( RecFlag(..), NewOrData(..) )
+import RnHsSyn ( RenamedTyClDecl, tyClDeclFVs )
+import BasicTypes ( RecFlag(..), NewOrData(..), isRec )
+import HscTypes ( implicitTyThingIds )
import TcMonad
import TcEnv ( TcEnv, RecTcEnv, TcTyThing(..), TyThing(..), TyThingDetails(..),
- tcExtendKindEnv, tcLookup, tcExtendGlobalEnv )
+ tcExtendKindEnv, tcLookup, tcExtendGlobalEnv, tcExtendGlobalValEnv )
import TcTyDecls ( tcTyDecl1, kcConDetails, mkNewTyConRep )
import TcClassDcl ( tcClassDecl1 )
import TcMonoType ( kcHsTyVars, kcHsType, kcHsBoxedSigType, kcHsContext, mkTyClTyVars )
import TcUnify ( unifyKind )
import TcInstDcls ( tcAddDeclCtxt )
-import Type ( Kind, mkArrowKind, boxedTypeKind, zipFunTys )
+import Type ( Kind, mkArrowKind, zipFunTys )
import Variance ( calcTyConArgVrcs )
import Class ( Class, mkClass, classTyCon )
import TyCon ( TyCon, tyConKind, ArgVrcs, AlgTyConFlavour(..),
- mkSynTyCon, mkAlgTyConRep, mkClassTyCon )
+ mkSynTyCon, mkAlgTyCon, mkClassTyCon )
import DataCon ( isNullaryDataCon )
import Var ( varName )
import FiniteMap
import Digraph ( stronglyConnComp, SCC(..) )
-import Name ( Name, NamedThing(..), NameEnv, getSrcLoc,
- mkNameEnv, lookupNameEnv_NF, isTyVarName
- )
+import Name ( Name, getSrcLoc, isTyVarName )
+import Name ( NameEnv, mkNameEnv, lookupNameEnv_NF )
import NameSet
import Outputable
import Maybes ( mapMaybe )
import ErrUtils ( Message )
import HsDecls ( getClassDeclSysNames )
import Generics ( mkTyConGenInfo )
-import CmdLineOpts ( DynFlags )
\end{code}
~~~~~~~~~~~~~~~~~
\begin{code}
tcTyAndClassDecls :: RecTcEnv -- Knot tying stuff
- -> [RenamedHsDecl]
+ -> [RenamedTyClDecl]
-> TcM TcEnv
tcTyAndClassDecls unf_env decls
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.
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, 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
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}
\begin{code}
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 _ _ _ _ _ _)
- = kcHsTyVars tyvars `thenNF_Tc` \ arg_kinds ->
- returnNF_Tc (name, mk_kind arg_kinds boxedTypeKind)
-
-getInitialKind (ClassDecl _ name tyvars _ _ _ _ _ )
- = kcHsTyVars tyvars `thenNF_Tc` \ arg_kinds ->
- returnNF_Tc (name, mk_kind arg_kinds boxedTypeKind)
+getInitialKind decl
+ = kcHsTyVars (tcdTyVars decl) `thenNF_Tc` \ arg_kinds ->
+ newKindVar `thenNF_Tc` \ result_kind ->
+ returnNF_Tc (tcdName decl, mk_kind arg_kinds result_kind)
mk_kind tvs_w_kinds res_kind = foldr (mkArrowKind . snd) res_kind tvs_w_kinds
\end{code}
\begin{code}
kcTyClDecl :: RenamedTyClDecl -> TcM ()
-kcTyClDecl decl@(TySynonym tycon_name hs_tyvars rhs loc)
- = tcAddDeclCtxt decl $
- kcTyClDeclBody tycon_name hs_tyvars $ \ result_kind ->
- kcHsType rhs `thenTc` \ rhs_kind ->
+kcTyClDecl decl@(TySynonym {tcdSynRhs = rhs})
+ = kcTyClDeclBody decl $ \ result_kind ->
+ kcHsType rhs `thenTc` \ rhs_kind ->
unifyKind result_kind rhs_kind
-kcTyClDecl decl@(TyData _ context tycon_name hs_tyvars con_decls _ _ loc _ _)
- = tcAddDeclCtxt decl $
- kcTyClDeclBody tycon_name hs_tyvars $ \ result_kind ->
+kcTyClDecl decl@(TyData {tcdND = new_or_data, tcdCtxt = context, tcdCons = con_decls})
+ = kcTyClDeclBody decl $ \ result_kind ->
kcHsContext context `thenTc_`
mapTc_ kc_con_decl con_decls
where
kc_con_decl (ConDecl _ _ ex_tvs ex_ctxt details loc)
- = tcAddSrcLoc loc $
- kcHsTyVars ex_tvs `thenNF_Tc` \ kind_env ->
+ = kcHsTyVars ex_tvs `thenNF_Tc` \ kind_env ->
tcExtendKindEnv kind_env $
- kcConDetails ex_ctxt details
-
-kcTyClDecl decl@(ClassDecl context class_name
- hs_tyvars fundeps class_sigs
- _ _ loc)
- = tcAddDeclCtxt decl $
- kcTyClDeclBody class_name hs_tyvars $ \ result_kind ->
- kcHsContext context `thenTc_`
+ kcConDetails new_or_data ex_ctxt details
+
+kcTyClDecl decl@(ClassDecl {tcdCtxt = context, tcdSigs = class_sigs})
+ = kcTyClDeclBody decl $ \ result_kind ->
+ kcHsContext context `thenTc_`
mapTc_ kc_sig (filter isClassOpSig class_sigs)
where
- kc_sig (ClassOpSig _ _ op_ty loc) = tcAddSrcLoc loc (kcHsBoxedSigType op_ty)
+ kc_sig (ClassOpSig _ _ op_ty loc) = kcHsBoxedSigType op_ty
-kcTyClDeclBody :: Name -> [HsTyVarBndr Name] -- Kind of the tycon/cls and its tyvars
- -> (Kind -> TcM a) -- Thing inside
- -> TcM a
+kcTyClDeclBody :: RenamedTyClDecl -> (Kind -> TcM a) -> 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
- = tcLookup tc_name `thenNF_Tc` \ thing ->
+kcTyClDeclBody decl thing_inside
+ = tcAddDeclCtxt decl $
+ tcLookup (tcdName decl) `thenNF_Tc` \ thing ->
let
kind = case thing of
AGlobal (ATyCon tc) -> tyConKind tc
AThing kind -> kind
-- For some odd reason, a class doesn't include its kind
- (tyvars_w_kinds, result_kind) = zipFunTys (hsTyVarNames hs_tyvars) kind
+ (tyvars_w_kinds, result_kind) = zipFunTys (hsTyVarNames (tcdTyVars decl)) kind
in
tcExtendKindEnv tyvars_w_kinds (thing_inside result_kind)
\end{code}
:: 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 dflags is_rec kenv rec_vrcs rec_details
- (TySynonym tycon_name tyvar_names rhs src_loc)
- = (tycon_name, ATyCon tycon)
+ (TySynonym {tcdName = tycon_name, tcdTyVars = tyvar_names})
+ = ATyCon tycon
where
tycon = mkSynTyCon tycon_name tycon_kind arity tyvars rhs_ty argvrcs
tycon_kind = lookupNameEnv_NF kenv tycon_name
argvrcs = lookupWithDefaultFM rec_vrcs bogusVrcs tycon
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)
+ (TyData {tcdND = data_or_new, tcdName = tycon_name, tcdTyVars = tyvar_names,
+ tcdNCons = nconstrs, tcdSysNames = sys_names})
+ = 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 dflags 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 sys_names
+
+ 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
| otherwise -> DataTyCon
buildTyConOrClass dflags is_rec kenv rec_vrcs rec_details
- (ClassDecl context class_name
- tyvar_names fundeps class_sigs def_methods
- name_list src_loc)
- = (class_name, AClass clas)
+ (ClassDecl {tcdName = class_name, tcdTyVars = tyvar_names,
+ tcdFDs = fundeps, tcdSysNames = name_list} )
+ = AClass clas
where
(tycon_name, _, _, _) = getClassDeclSysNames name_list
clas = mkClass class_name tyvars fds
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 mkClassEdges tycl_decls)
in
returnTc decl_sccs
where
- tycl_decls = [d | TyClD d <- decls, not (isIfaceSigDecl d)]
+ tycl_decls = filter (not . isIfaceSigDecl) decls
edges = map mkEdges tycl_decls
is_syn_decl (d, _, _) = isSynDecl d
\begin{code}
tyClDeclFTVs :: RenamedTyClDecl -> [Name]
+ -- Find the free non-tyvar vars
tyClDeclFTVs d = foldNameSet add [] (tyClDeclFVs d)
where
add n fvs | isTyVarName n = fvs
mkClassEdges :: RenamedTyClDecl -> Maybe (RenamedTyClDecl, Name, [Name])
-mkClassEdges decl@(ClassDecl ctxt name _ _ _ _ _ _) = Just (decl, name, [c | HsPClass c _ <- ctxt])
-mkClassEdges other_decl = Nothing
+mkClassEdges decl@(ClassDecl {tcdCtxt = ctxt, tcdName = name}) = Just (decl, name, [c | HsPClass c _ <- ctxt])
+mkClassEdges other_decl = Nothing
-----------------------------------------------------
mkEdges :: RenamedTyClDecl -> (RenamedTyClDecl, Name, [Name])
mkEdges decl = (decl, tyClDeclName decl, tyClDeclFTVs decl)
\end{code}
projects / ghc-hetmet.git / blobdiff