X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBuildTyCl.lhs;h=6384ddc4c504f9c4079eec2f093a6a9e24a2191c;hb=844fa86873b806594191043afdea638472f45619;hp=ad580289c518a037e5fbac75b80c5f51e8076474;hpb=c94408e522e5af3b79a5beadc7e6d15cee553ee7;p=ghc-hetmet.git diff --git a/compiler/iface/BuildTyCl.lhs b/compiler/iface/BuildTyCl.lhs index ad58028..6384ddc 100644 --- a/compiler/iface/BuildTyCl.lhs +++ b/compiler/iface/BuildTyCl.lhs @@ -6,7 +6,8 @@ module BuildTyCl ( buildSynTyCon, buildAlgTyCon, buildDataCon, buildClass, - mkAbstractTyConRhs, mkNewTyConRhs, mkDataTyConRhs + mkAbstractTyConRhs, mkOpenDataTyConRhs, mkOpenNewTyConRhs, + mkNewTyConRhs, mkDataTyConRhs ) where #include "HsVersions.h" @@ -22,21 +23,26 @@ import VarSet ( isEmptyVarSet, intersectVarSet, elemVarSet ) import TysWiredIn ( unitTy ) import BasicTypes ( RecFlag, StrictnessMark(..) ) import Name ( Name ) -import OccName ( mkDataConWrapperOcc, mkDataConWorkerOcc, mkClassTyConOcc, - mkClassDataConOcc, mkSuperDictSelOcc, mkNewTyCoOcc ) +import OccName ( mkDataConWrapperOcc, mkDataConWorkerOcc, + mkClassTyConOcc, mkClassDataConOcc, + mkSuperDictSelOcc, mkNewTyCoOcc, mkInstTyTcOcc, + mkInstTyCoOcc ) import MkId ( mkDataConIds, mkRecordSelId, mkDictSelId ) import Class ( mkClass, Class( classTyCon), FunDep, DefMeth(..) ) -import TyCon ( mkSynTyCon, mkAlgTyCon, visibleDataCons, tyConStupidTheta, - tyConDataCons, isNewTyCon, mkClassTyCon, TyCon( tyConTyVars ), - isRecursiveTyCon, tyConArity, - AlgTyConRhs(..), newTyConRhs ) +import TyCon ( mkSynTyCon, mkAlgTyCon, visibleDataCons, + tyConStupidTheta, tyConDataCons, isNewTyCon, + mkClassTyCon, TyCon( tyConTyVars ), + isRecursiveTyCon, tyConArity, AlgTyConRhs(..), + SynTyConRhs(..), newTyConRhs, AlgTyConParent(..) ) import Type ( mkArrowKinds, liftedTypeKind, typeKind, tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, - splitTyConApp_maybe, splitAppTy_maybe, getTyVar_maybe, - mkPredTys, mkTyVarTys, ThetaType, Type, + splitTyConApp_maybe, splitAppTy_maybe, + getTyVar_maybe, + mkPredTys, mkTyVarTys, ThetaType, Type, Kind, + TyThing(..), substTyWith, zipTopTvSubst, substTheta, mkForAllTys, mkTyConApp, mkTyVarTy ) -import Coercion ( mkNewTypeCoercion ) +import Coercion ( mkNewTypeCoercion, mkDataInstCoercion ) import Outputable import List ( nub ) @@ -45,8 +51,13 @@ import List ( nub ) \begin{code} ------------------------------------------------------ -buildSynTyCon name tvs rhs_ty - = mkSynTyCon name kind tvs rhs_ty +buildSynTyCon :: Name -> [TyVar] -> SynTyConRhs -> TyCon +buildSynTyCon name tvs rhs@(OpenSynTyCon rhs_ki) + = mkSynTyCon name kind tvs rhs + where + kind = mkArrowKinds (map tyVarKind tvs) rhs_ki +buildSynTyCon name tvs rhs@(SynonymTyCon rhs_ty) + = mkSynTyCon name kind tvs rhs where kind = mkArrowKinds (map tyVarKind tvs) (typeKind rhs_ty) @@ -58,20 +69,57 @@ buildAlgTyCon :: Name -> [TyVar] -> RecFlag -> Bool -- True <=> want generics functions -> Bool -- True <=> was declared in GADT syntax + -> Maybe (TyCon, [Type]) -- family instance if applicable -> TcRnIf m n TyCon buildAlgTyCon tc_name tvs stupid_theta rhs is_rec want_generics gadt_syn - = do { let { tycon = mkAlgTyCon tc_name kind tvs stupid_theta - rhs fields is_rec want_generics gadt_syn - ; kind = mkArrowKinds (map tyVarKind tvs) liftedTypeKind - ; fields = mkTyConSelIds tycon rhs - } - ; return tycon } + mb_family + = do { -- We need to tie a knot as the coercion of a data instance depends + -- on the instance representation tycon and vice versa. + ; tycon <- fixM (\ tycon_rec -> do + { parent <- parentInfo mb_family tycon_rec + ; let { tycon = mkAlgTyCon tc_name kind tvs stupid_theta rhs + fields parent is_rec want_generics gadt_syn + ; kind = mkArrowKinds (map tyVarKind tvs) liftedTypeKind + ; fields = mkTyConSelIds tycon rhs + } + ; return tycon + }) + ; return tycon + } + where + -- If a family tycon with instance types is given, the current tycon is an + -- instance of that family and we need to + -- + -- (1) create a coercion that identifies the family instance type and the + -- representation type from Step (1); ie, it is of the form + -- `Co tvs :: F ts :=: R tvs', where `Co' is the name of the coercion, + -- `F' the family tycon and `R' the (derived) representation tycon, + -- and + -- (2) produce a `AlgTyConParent' value containing the parent and coercion + -- information. + -- + parentInfo Nothing rep_tycon = + return NoParentTyCon + parentInfo (Just (family, instTys)) rep_tycon = + do { -- Create the coercion + ; co_tycon_name <- newImplicitBinder tc_name mkInstTyCoOcc + ; let co_tycon = mkDataInstCoercion co_tycon_name tvs + family instTys rep_tycon + ; return $ FamilyTyCon family instTys co_tycon + } + ------------------------------------------------------ mkAbstractTyConRhs :: AlgTyConRhs mkAbstractTyConRhs = AbstractTyCon +mkOpenDataTyConRhs :: AlgTyConRhs +mkOpenDataTyConRhs = OpenDataTyCon + +mkOpenNewTyConRhs :: AlgTyConRhs +mkOpenNewTyConRhs = OpenNewTyCon + mkDataTyConRhs :: [DataCon] -> AlgTyConRhs mkDataTyConRhs cons = DataTyCon { data_cons = cons, is_enum = all isNullarySrcDataCon cons } @@ -82,15 +130,24 @@ mkNewTyConRhs :: Name -> TyCon -> DataCon -> TcRnIf m n AlgTyConRhs -- because the latter is part of a knot, whereas the former is not. mkNewTyConRhs tycon_name tycon con = do { co_tycon_name <- newImplicitBinder tycon_name mkNewTyCoOcc - ; let co_tycon = mkNewTypeCoercion co_tycon_name tycon tvs rhs_ty + ; let co_tycon = mkNewTypeCoercion co_tycon_name tycon tvs rhs_ty + cocon_maybe + | all_coercions || isRecursiveTyCon tycon + = Just co_tycon + | otherwise + = Nothing ; return (NewTyCon { data_con = con, - nt_co = Just co_tycon, + nt_co = cocon_maybe, -- Coreview looks through newtypes with a Nothing -- for nt_co, or uses explicit coercions otherwise nt_rhs = rhs_ty, nt_etad_rhs = eta_reduce tvs rhs_ty, nt_rep = mkNewTyConRep tycon rhs_ty }) } where + -- if all_coercions is True then we use coercions for all newtypes + -- otherwise we use coercions for recursive newtypes and look through + -- non-recursive newtypes + all_coercions = True tvs = tyConTyVars tycon rhs_ty = head (dataConInstOrigArgTys con (mkTyVarTys tvs)) -- Instantiate the data con with the @@ -138,7 +195,7 @@ mkNewTyConRep tc rhs_ty if isRecursiveTyCon tc then go (tc:tcs) (substTyWith tvs tys rhs_ty) else - go tcs (head tys) + substTyWith tvs tys rhs_ty where (tvs, rhs_ty) = newTyConRhs tc @@ -171,7 +228,8 @@ buildDataCon src_name declared_infix arg_stricts field_lbls data_con = mkDataCon src_name declared_infix arg_stricts field_lbls univ_tvs ex_tvs eq_spec ctxt - arg_tys tycon stupid_ctxt dc_ids + arg_tys tycon + stupid_ctxt dc_ids dc_ids = mkDataConIds wrap_name work_name data_con ; returnM data_con } @@ -208,11 +266,12 @@ mkTyConSelIds tycon rhs \begin{code} buildClass :: Name -> [TyVar] -> ThetaType -> [FunDep TyVar] -- Functional dependencies + -> [TyThing] -- Associated types -> [(Name, DefMeth, Type)] -- Method info -> RecFlag -- Info for type constructor -> TcRnIf m n Class -buildClass class_name tvs sc_theta fds sig_stuff tc_isrec +buildClass class_name tvs sc_theta fds ats sig_stuff tc_isrec = do { tycon_name <- newImplicitBinder class_name mkClassTyConOcc ; datacon_name <- newImplicitBinder class_name mkClassDataConOcc -- The class name is the 'parent' for this datacon, not its tycon, @@ -262,10 +321,12 @@ buildClass class_name tvs sc_theta fds sig_stuff tc_isrec -- Because C has only one operation, it is represented by -- a newtype, and it should be a *recursive* newtype. -- [If we don't make it a recursive newtype, we'll expand the - -- newtype like a synonym, but that will lead to an infinite type] + -- newtype like a synonym, but that will lead to an infinite + -- type] + ; atTyCons = [tycon | ATyCon tycon <- ats] } - ; return (mkClass class_name tvs fds - sc_theta sc_sel_ids op_items + ; return (mkClass class_name tvs fds + sc_theta sc_sel_ids atTyCons op_items tycon) })} \end{code}