import HsSyn ( MonoBinds(..),
TyClDecl(..), ConDecl(..), ConDetails(..), BangType(..),
- andMonoBindList, getBangType
+ getBangType
)
import RnHsSyn ( RenamedTyClDecl, RenamedConDecl, RenamedContext )
import TcHsSyn ( TcMonoBinds, idsToMonoBinds )
-import BasicTypes ( RecFlag(..), NewOrData(..) )
+import BasicTypes ( NewOrData(..) )
-import TcMonoType ( tcHsSigType, tcHsBoxedSigType, kcTyVarScope, tcClassContext,
+import TcMonoType ( tcHsType, tcHsSigType, tcHsBoxedSigType, tcHsTyVars, tcClassContext,
kcHsContext, kcHsSigType
)
-import TcEnv ( tcExtendTyVarEnv, tcLookupTy, tcLookupValueByKey, TyThing(..), TyThingDetails(..) )
+import TcEnv ( tcExtendTyVarEnv,
+ tcLookupTyCon, tcLookupClass, tcLookupGlobalId,
+ TyThingDetails(..)
+ )
import TcMonad
-import TcUnify ( unifyKind )
-import Class ( Class, ClassContext )
+import Class ( ClassContext )
import DataCon ( DataCon, mkDataCon,
dataConFieldLabels, dataConId, dataConWrapId,
markedStrict, notMarkedStrict, markedUnboxed, dataConRepType
import MkId ( mkDataConId, mkDataConWrapId, mkRecordSelId )
import FieldLabel
import Var ( Id, TyVar )
-import Name ( Name, isLocallyDefined, OccName, NamedThing(..), nameUnique )
+import Name ( Name, isLocallyDefined, NamedThing(..) )
import Outputable
-import TyCon ( TyCon, AlgTyConFlavour(..), ArgVrcs, mkSynTyCon, mkAlgTyCon,
- tyConDataConsIfAvailable, tyConTyVars,
- isSynTyCon, isNewTyCon
+import TyCon ( TyCon, isSynTyCon, isNewTyCon,
+ tyConDataConsIfAvailable, tyConTyVars, tyConGenIds
)
-import Type ( getTyVar, tyVarsOfTypes, splitFunTy, applyTys,
- mkTyConApp, mkTyVarTys, mkForAllTys, mkFunTy,
- mkTyVarTy, splitAlgTyConApp_maybe,
- mkArrowKind, mkArrowKinds, boxedTypeKind,
- isUnboxedType, Type, ThetaType, classesOfPreds
+import Type ( tyVarsOfTypes, splitFunTy, applyTys,
+ mkTyConApp, mkTyVarTys, mkForAllTys,
+ splitAlgTyConApp_maybe, Type
)
import TysWiredIn ( unitTy )
-import Var ( tyVarKind )
import VarSet ( intersectVarSet, isEmptyVarSet )
-import Unique ( unpackCStringIdKey )
-import Util ( equivClasses )
-import FiniteMap ( FiniteMap, lookupWithDefaultFM )
+import PrelNames ( unpackCStringName, unpackCStringUtf8Name )
+import ListSetOps ( equivClasses )
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-tcTyDecl1 :: RenamedTyClDecl -> TcM s (Name, TyThingDetails)
+tcTyDecl1 :: RenamedTyClDecl -> TcM (Name, TyThingDetails)
tcTyDecl1 (TySynonym tycon_name tyvar_names rhs src_loc)
- = tcLookupTy tycon_name `thenNF_Tc` \ (ATyCon tycon) ->
+ = tcLookupTyCon tycon_name `thenNF_Tc` \ tycon ->
tcExtendTyVarEnv (tyConTyVars tycon) $
- tcHsSigType rhs `thenTc` \ rhs_ty ->
+ tcHsType rhs `thenTc` \ rhs_ty ->
+ -- Note tcHsType not tcHsSigType; we allow type synonyms
+ -- that aren't types; e.g. type List = []
+ --
-- If the RHS mentions tyvars that aren't in scope, we'll
- -- quantify over them. With gla-exts that's right, but for H98
- -- we should complain. We can now do that here without falling into
+ -- quantify over them:
+ -- e.g. type T = a->a
+ -- will become type T = forall a. a->a
+ --
+ -- With gla-exts that's right, but for H98 we should complain.
+ -- We can now do that here without falling into
-- a black hole, we still do it in rnDecl (TySynonym case)
+
returnTc (tycon_name, SynTyDetails rhs_ty)
-tcTyDecl1 (TyData _ context tycon_name _ con_decls _ derivings _ src_loc)
- = tcLookupTy tycon_name `thenNF_Tc` \ (ATyCon tycon) ->
+tcTyDecl1 (TyData new_or_data context tycon_name _ con_decls _ derivings src_loc name1 name2)
+ = tcLookupTyCon tycon_name `thenNF_Tc` \ tycon ->
let
tyvars = tyConTyVars tycon
in
tcExtendTyVarEnv tyvars $
-- Typecheck the pieces
- tcClassContext context `thenTc` \ ctxt ->
- tc_derivs derivings `thenTc` \ derived_classes ->
- mapTc (tcConDecl tycon tyvars ctxt) con_decls `thenTc` \ data_cons ->
+ tcClassContext context `thenTc` \ ctxt ->
+ tc_derivs derivings `thenTc` \ derived_classes ->
+ mapTc (tcConDecl new_or_data tycon tyvars ctxt) con_decls `thenTc` \ data_cons ->
returnTc (tycon_name, DataTyDetails ctxt data_cons derived_classes)
where
tc_derivs Nothing = returnTc []
- tc_derivs (Just ds) = mapTc tc_deriv ds
-
- tc_deriv name = tcLookupTy name `thenTc` \ (AClass clas) ->
- returnTc clas
+ tc_derivs (Just ds) = mapTc tcLookupClass ds
\end{code}
\begin{code}
%************************************************************************
\begin{code}
-kcConDetails :: RenamedContext -> ConDetails Name -> TcM s ()
+kcConDetails :: RenamedContext -> ConDetails Name -> TcM ()
kcConDetails ex_ctxt details
= kcHsContext ex_ctxt `thenTc_`
kc_con_details details
where
kc_con_details (VanillaCon btys) = mapTc_ kc_bty btys
kc_con_details (InfixCon bty1 bty2) = mapTc_ kc_bty [bty1,bty2]
- kc_con_details (NewCon ty _) = kcHsSigType ty
kc_con_details (RecCon flds) = mapTc_ kc_field flds
kc_field (_, bty) = kc_bty bty
kc_bty bty = kcHsSigType (getBangType bty)
-tcConDecl :: TyCon -> [TyVar] -> ClassContext -> RenamedConDecl -> TcM s DataCon
+tcConDecl :: NewOrData -> TyCon -> [TyVar] -> ClassContext -> RenamedConDecl -> TcM DataCon
-tcConDecl tycon tyvars ctxt (ConDecl name wkr_name ex_tvs ex_ctxt details src_loc)
+tcConDecl new_or_data tycon tyvars ctxt (ConDecl name wkr_name ex_tvs ex_ctxt details src_loc)
= tcAddSrcLoc src_loc $
- kcTyVarScope ex_tvs (kcConDetails ex_ctxt details) `thenTc` \ ex_tyvars ->
- tcExtendTyVarEnv ex_tyvars $
+ tcHsTyVars ex_tvs (kcConDetails ex_ctxt details) $ \ ex_tyvars ->
tcClassContext ex_ctxt `thenTc` \ ex_theta ->
case details of
VanillaCon btys -> tc_datacon ex_tyvars ex_theta btys
InfixCon bty1 bty2 -> tc_datacon ex_tyvars ex_theta [bty1,bty2]
- NewCon ty mb_f -> tc_newcon ex_tyvars ex_theta ty mb_f
RecCon fields -> tc_rec_con ex_tyvars ex_theta fields
where
+ tc_sig_type = case new_or_data of
+ DataType -> tcHsSigType
+ NewType -> tcHsBoxedSigType
+ -- Can't allow an unboxed type here, because we're effectively
+ -- going to remove the constructor while coercing it to a boxed type.
+
tc_datacon ex_tyvars ex_theta btys
= let
arg_stricts = map getBangStrictness btys
tys = map getBangType btys
in
- mapTc tcHsSigType tys `thenTc` \ arg_tys ->
+ mapTc tc_sig_type tys `thenTc` \ arg_tys ->
mk_data_con ex_tyvars ex_theta arg_stricts arg_tys []
- tc_newcon ex_tyvars ex_theta ty mb_f
- = tcHsBoxedSigType ty `thenTc` \ arg_ty ->
- -- can't allow an unboxed type here, because we're effectively
- -- going to remove the constructor while coercing it to a boxed type.
- let
- field_label =
- case mb_f of
- Nothing -> []
- Just f -> [mkFieldLabel (getName f) tycon arg_ty (head allFieldLabelTags)]
- in
- mk_data_con ex_tyvars ex_theta [notMarkedStrict] [arg_ty] field_label
-
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 ->
(map fieldLabelType field_labels) field_labels
tc_field ((field_label_names, bty), tag)
- = tcHsSigType (getBangType bty) `thenTc` \ field_ty ->
+ = tc_sig_type (getBangType bty) `thenTc` \ field_ty ->
returnTc [mkFieldLabel (getName name) tycon field_ty tag | name <- field_label_names]
mk_data_con ex_tyvars ex_theta arg_stricts arg_tys fields
%************************************************************************
\begin{code}
-mkImplicitDataBinds :: [TyCon] -> TcM s ([Id], TcMonoBinds)
+mkImplicitDataBinds :: [TyCon] -> TcM ([Id], TcMonoBinds)
mkImplicitDataBinds [] = returnTc ([], EmptyMonoBinds)
mkImplicitDataBinds (tycon : tycons)
| isSynTyCon tycon = mkImplicitDataBinds tycons
mkImplicitDataBinds_one tycon
= mapTc (mkRecordSelector tycon) groups `thenTc` \ sel_ids ->
let
- unf_ids = sel_ids ++ data_con_wrapper_ids
- all_ids = map dataConId data_cons ++ unf_ids
+ unf_ids = sel_ids ++ data_con_wrapper_ids ++ gen_ids
+ all_ids = map dataConId data_cons ++ unf_ids
-- For the locally-defined things
-- we need to turn the unfoldings inside the selector Ids into bindings,
data_cons = tyConDataConsIfAvailable tycon
-- Abstract types mean we don't bring the
-- data cons into scope, which should be fine
-
+ gen_ids = tyConGenIds tycon
data_con_wrapper_ids = map dataConWrapId data_cons
fields = [ (con, field) | con <- data_cons,
-- data type use the same type variables
= checkTc (all (== field_ty) other_tys)
(fieldTypeMisMatch field_name) `thenTc_`
- tcLookupValueByKey unpackCStringIdKey `thenTc` \ unpack_id ->
- returnTc (mkRecordSelId tycon first_field_label unpack_id)
+ tcLookupGlobalId unpackCStringName `thenTc` \ unpack_id ->
+ tcLookupGlobalId unpackCStringUtf8Name `thenTc` \ unpackUtf8_id ->
+ returnTc (mkRecordSelId tycon first_field_label unpack_id unpackUtf8_id)
where
field_ty = fieldLabelType first_field_label
field_name = fieldLabelName first_field_label
projects / ghc-hetmet.git / blobdiff