X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FBuildTyCl.lhs;h=75d7234059bf25bf071d05dc44f95e44c6e4775e;hp=05f5f4bc22e7e69d6f6ff21ae73c552367677503;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hpb=80c89b80c355b2aaebcd53330e6c6170c3f05aca diff --git a/compiler/iface/BuildTyCl.lhs b/compiler/iface/BuildTyCl.lhs index 05f5f4b..75d7234 100644 --- a/compiler/iface/BuildTyCl.lhs +++ b/compiler/iface/BuildTyCl.lhs @@ -1,4 +1,5 @@ % +% (c) The University of Glasgow 2006 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % @@ -12,39 +13,24 @@ module BuildTyCl ( #include "HsVersions.h" -import IfaceEnv ( newImplicitBinder ) +import IfaceEnv import TcRnMonad -import DataCon ( DataCon, isNullarySrcDataCon, dataConUnivTyVars, - mkDataCon, dataConFieldLabels, dataConInstOrigArgTys, - dataConTyCon ) -import Var ( tyVarKind, TyVar, Id ) -import VarSet ( isEmptyVarSet, intersectVarSet, elemVarSet ) -import TysWiredIn ( unitTy ) -import BasicTypes ( RecFlag, StrictnessMark(..) ) -import Name ( Name ) -import OccName ( mkDataConWrapperOcc, mkDataConWorkerOcc, - mkClassTyConOcc, mkClassDataConOcc, - mkSuperDictSelOcc, mkNewTyCoOcc, mkLocalOcc ) -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(..), - SynTyConRhs(..), newTyConRhs, AlgTyConParent(..) ) -import Type ( mkArrowKinds, liftedTypeKind, typeKind, - tyVarsOfType, tyVarsOfTypes, tyVarsOfPred, - splitTyConApp_maybe, splitAppTy_maybe, - getTyVar_maybe, - mkPredTys, mkTyVarTys, ThetaType, Type, Kind, - TyThing(..), - substTyWith, zipTopTvSubst, substTheta, mkForAllTys, - mkTyConApp, mkTyVarTy ) -import Coercion ( mkNewTypeCoercion ) +import DataCon +import Var +import VarSet +import TysWiredIn +import BasicTypes +import Name +import OccName +import MkId +import Class +import TyCon +import Type +import Coercion import Outputable -import List ( nub ) +import Data.List \end{code} @@ -68,27 +54,46 @@ buildAlgTyCon :: Name -> [TyVar] -> RecFlag -> Bool -- True <=> want generics functions -> Bool -- True <=> was declared in GADT syntax - -> Maybe TyCon -- Just family <=> instance of `family' + -> Maybe (TyCon, [Type]) -- family instance if applicable -> TcRnIf m n TyCon buildAlgTyCon tc_name tvs stupid_theta rhs is_rec want_generics gadt_syn mb_family - = do { -- In case of a type instance, we need to invent a new name for the - -- instance type, as `tc_name' is the family name. - ; uniq <- newUnique - ; (final_name, parent) <- - case mb_family of - Nothing -> return (tc_name, NoParentTyCon) - Just family -> - do { final_name <- newImplicitBinder tc_name (mkLocalOcc uniq) - ; return (final_name, FamilyTyCon family) - } - ; let { tycon = mkAlgTyCon final_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 } + = 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 @@ -110,21 +115,20 @@ 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 - cocon_maybe - | all_coercions || isRecursiveTyCon tycon - = Just co_tycon - | otherwise - = Nothing - ; return (NewTyCon { data_con = con, + ; let co_tycon = mkNewTypeCoercion co_tycon_name tycon etad_rhs + cocon_maybe | all_coercions || isRecursiveTyCon tycon + = Just co_tycon + | otherwise + = Nothing + ; return (NewTyCon { data_con = con, + nt_rhs = rhs_ty, + nt_etad_rhs = etad_rhs, 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 + -- 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 @@ -133,18 +137,20 @@ mkNewTyConRhs tycon_name tycon con -- Instantiate the data con with the -- type variables from the tycon - eta_reduce [] ty = ([], ty) - eta_reduce (a:as) ty | null as', - Just (fun, arg) <- splitAppTy_maybe ty', + etad_rhs :: ([TyVar], Type) + etad_rhs = eta_reduce (reverse tvs) rhs_ty + + eta_reduce :: [TyVar] -- Reversed + -> Type -- Rhs type + -> ([TyVar], Type) -- Eta-reduced version (tyvars in normal order) + eta_reduce (a:as) ty | Just (fun, arg) <- splitAppTy_maybe ty, Just tv <- getTyVar_maybe arg, tv == a, not (a `elemVarSet` tyVarsOfType fun) - = ([], fun) -- Successful eta reduction - | otherwise - = (a:as', ty') - where - (as', ty') = eta_reduce as ty + = eta_reduce as fun + eta_reduce tvs ty = (reverse tvs, ty) + mkNewTyConRep :: TyCon -- The original type constructor -> Type -- The arg type of its constructor -> Type -- Chosen representation type @@ -190,14 +196,13 @@ buildDataCon :: Name -> Bool -> ThetaType -- Does not include the "stupid theta" -- or the GADT equalities -> [Type] -> TyCon - -> Maybe [Type] -- Just ts <=> type pats of inst type -> TcRnIf m n DataCon -- A wrapper for DataCon.mkDataCon that -- a) makes the worker Id -- b) makes the wrapper Id if necessary, including -- allocating its unique (hence monadic) buildDataCon src_name declared_infix arg_stricts field_lbls - univ_tvs ex_tvs eq_spec ctxt arg_tys tycon mb_typats + univ_tvs ex_tvs eq_spec ctxt arg_tys tycon = do { wrap_name <- newImplicitBinder src_name mkDataConWrapperOcc ; work_name <- newImplicitBinder src_name mkDataConWorkerOcc -- This last one takes the name of the data constructor in the source @@ -209,7 +214,7 @@ 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 mb_typats + arg_tys tycon stupid_ctxt dc_ids dc_ids = mkDataConIds wrap_name work_name data_con @@ -286,7 +291,7 @@ buildClass class_name tvs sc_theta fds ats sig_stuff tc_isrec tvs [{- no existentials -}] [{- No equalities -}] [{-No context-}] dict_component_tys - rec_tycon Nothing + rec_tycon ; rhs <- case dict_component_tys of [rep_ty] -> mkNewTyConRhs tycon_name rec_tycon dict_con