X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypes%2FPprType.lhs;h=d0fd5db2e78f9c8d3453666a57f481e320e025ec;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=051ad922cb90786b21c287c74988ca64b3022d57;hpb=e72062f5239a13f243d6e98b5124e2fdbab1c940;p=ghc-hetmet.git diff --git a/ghc/compiler/types/PprType.lhs b/ghc/compiler/types/PprType.lhs index 051ad92..d0fd5db 100644 --- a/ghc/compiler/types/PprType.lhs +++ b/ghc/compiler/types/PprType.lhs @@ -1,93 +1,83 @@ % -% (c) The AQUA Project, Glasgow University, 1996 +% (c) The AQUA Project, Glasgow University, 1996-1998 % \section[PprType]{Printing Types, TyVars, Classes, TyCons} \begin{code} -#include "HsVersions.h" - module PprType( - GenTyVar, pprGenTyVar, pprTyVarBndr, - TyCon, pprTyCon, showTyCon, - GenType, - pprGenType, pprParendGenType, + pprKind, pprParendKind, pprType, pprParendType, - pprMaybeTy, - getTypeString, - specMaybeTysSuffix, + pprConstraint, pprTheta, + pprTyVarBndr, pprTyVarBndrs, + getTyDescription, - GenClass, nmbrType, nmbrGlobalType ) where -IMP_Ubiq() -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201 -IMPORT_DELOOPER(IdLoop) -#else -import {-# SOURCE #-} Id -#endif - +#include "HsVersions.h" -- friends: -- (PprType can see all the representations it's trying to print) -import Type ( GenType(..), maybeAppTyCon, Type(..), splitFunTy, - splitForAllTy, splitSigmaTy, splitRhoTy, splitAppTys ) -import TyVar ( GenTyVar(..), TyVar(..), cloneTyVar ) -import TyCon ( TyCon, NewOrData, isFunTyCon, isTupleTyCon, tyConArity ) -import Class ( SYN_IE(Class), GenClass(..) ) -import Kind ( Kind(..), isBoxedTypeKind, pprParendKind ) -import Usage ( pprUVar, GenUsage(..), SYN_IE(Usage), SYN_IE(UVar), cloneUVar ) +import Type ( GenType(..), TyNote(..), Kind, Type, ThetaType, + splitFunTys, splitDictTy_maybe, + splitForAllTys, splitSigmaTy, splitRhoTy, + boxedTypeKind + ) +import Var ( GenTyVar, TyVar, tyVarKind, + tyVarName, setTyVarName + ) +import VarEnv +import TyCon ( TyCon, isTupleTyCon, isUnboxedTupleTyCon, tyConArity ) +import Class ( Class ) -- others: -import CStrings ( identToC ) -import CmdLineOpts ( opt_OmitInterfacePragmas, opt_PprUserLength ) import Maybes ( maybeToBool ) -import Name ( nameString, Name{-instance Outputable-}, - OccName, pprOccName, getOccString, NamedThing(..) - ) -import Outputable ( PprStyle(..), codeStyle, userStyle, ifaceStyle, - ifPprShowAll, interpp'SP, Outputable(..) - ) +import Name ( getOccString, setNameVisibility, NamedThing(..) ) +import Outputable import PprEnv -import Pretty -import UniqFM ( UniqFM, addToUFM, emptyUFM, lookupUFM ) -import Unique ( Unique, Uniquable(..), pprUnique10, pprUnique, +import Unique ( Unique, Uniquable(..), incrUnique, listTyConKey, initTyVarUnique ) import Util \end{code} +%************************************************************************ +%* * +\subsection{The external interface} +%* * +%************************************************************************ + +@pprType@ is the standard @Type@ printer; the overloaded @ppr@ function is +defined to use this. @pprParendType@ is the same, except it puts +parens around the type, except for the atomic cases. @pprParendType@ +works just by setting the initial context precedence very high. + \begin{code} -instance (Eq tyvar, Outputable tyvar, - Eq uvar, Outputable uvar ) => Outputable (GenType tyvar uvar) where - ppr PprQuote ty = quotes (pprGenType (PprForUser opt_PprUserLength) ty) - ppr sty ty = pprGenType sty ty - -instance Outputable TyCon where - ppr sty tycon = pprTyCon sty tycon - -instance Outputable (GenClass tyvar uvar) where - -- we use pprIfaceClass for printing in interfaces - ppr sty (Class u n _ _ _ _ _ _ _) = ppr sty n - -instance Outputable (GenTyVar flexi) where - ppr PprQuote ty = quotes (pprGenTyVar (PprForUser opt_PprUserLength) ty) - ppr sty tv = pprGenTyVar sty tv - --- and two SPECIALIZEd ones: -instance Outputable {-Type, i.e.:-}(GenType TyVar UVar) where - ppr PprQuote ty = quotes (pprGenType (PprForUser opt_PprUserLength) ty) - ppr other_sty ty = pprGenType other_sty ty - -instance Outputable {-TyVar, i.e.:-}(GenTyVar Usage) where - ppr PprQuote ty = quotes (pprGenTyVar (PprForUser opt_PprUserLength) ty) - ppr other_sty ty = pprGenTyVar other_sty ty +pprType, pprParendType :: GenType flexi -> SDoc +pprType ty = ppr_ty pprTyEnv tOP_PREC ty +pprParendType ty = ppr_ty pprTyEnv tYCON_PREC ty + +pprKind, pprParendKind :: Kind -> SDoc +pprKind = pprType +pprParendKind = pprParendType + +pprConstraint :: Class -> [GenType flexi] -> SDoc +pprConstraint clas tys = ppr clas <+> hsep (map (pprParendType) tys) + +pprTheta :: ThetaType -> SDoc +pprTheta theta = parens (hsep (punctuate comma (map ppr_dict theta))) + where + ppr_dict (c,tys) = pprConstraint c tys + +instance Outputable (GenType flexi) where + ppr ty = pprType ty \end{code} + %************************************************************************ %* * -\subsection[Type]{@Type@} +\subsection{Pretty printing} %* * %************************************************************************ @@ -112,152 +102,100 @@ maybeParen ctxt_prec inner_prec pretty | otherwise = parens pretty \end{code} -@pprGenType@ is the std @Type@ printer; the overloaded @ppr@ function is -defined to use this. @pprParendGenType@ is the same, except it puts -parens around the type, except for the atomic cases. @pprParendGenType@ -works just by setting the initial context precedence very high. - -\begin{code} -pprGenType, pprParendGenType :: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar) - => PprStyle -> GenType tyvar uvar -> Doc - -pprGenType sty ty = ppr_ty (init_ppr_env sty) tOP_PREC ty -pprParendGenType sty ty = ppr_ty (init_ppr_env sty) tYCON_PREC ty - -pprType, pprParendType :: PprStyle -> Type -> Doc -pprType sty ty = ppr_ty (init_ppr_env_type sty) tOP_PREC ty -pprParendType sty ty = ppr_ty (init_ppr_env_type sty) tYCON_PREC ty - -pprMaybeTy :: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar) - => PprStyle -> Maybe (GenType tyvar uvar) -> Doc -pprMaybeTy sty Nothing = char '*' -pprMaybeTy sty (Just ty) = pprParendGenType sty ty -\end{code} - \begin{code} -ppr_ty :: PprEnv tyvar uvar bndr occ -> Int - -> GenType tyvar uvar - -> Doc +ppr_ty :: PprEnv (GenTyVar flexi) flexi -> Int + -> GenType flexi + -> SDoc ppr_ty env ctxt_prec (TyVarTy tyvar) = pTyVarO env tyvar -ppr_ty env ctxt_prec (TyConTy tycon usage) - = ppr_tycon env tycon + -- TUPLE CASE (boxed and unboxed) +ppr_ty env ctxt_prec (TyConApp tycon tys) + | isTupleTyCon tycon + && length tys == tyConArity tycon -- no magic if partially applied + = parens tys_w_commas -ppr_ty env ctxt_prec ty@(ForAllTy _ _) - | show_forall = maybeParen ctxt_prec fUN_PREC $ - sep [ ptext SLIT("_forall_"), pp_tyvars, - ppr_theta env theta, ptext SLIT("=>"), pp_body - ] - | null theta = ppr_ty env ctxt_prec body_ty - | otherwise = maybeParen ctxt_prec fUN_PREC $ - sep [ppr_theta env theta, ptext SLIT("=>"), pp_body] + | isUnboxedTupleTyCon tycon + && length tys == tyConArity tycon -- no magic if partially applied + = parens (char '#' <+> tys_w_commas <+> char '#') + where + tys_w_commas = sep (punctuate comma (map (ppr_ty env tOP_PREC) tys)) + + -- LIST CASE +ppr_ty env ctxt_prec (TyConApp tycon [ty]) + | getUnique tycon == listTyConKey + = brackets (ppr_ty env tOP_PREC ty) + + -- DICTIONARY CASE, prints {C a} + -- This means that instance decls come out looking right in interfaces + -- and that in turn means they get "gated" correctly when being slurped in +ppr_ty env ctxt_prec ty@(TyConApp tycon tys) + | maybeToBool maybe_dict + = braces (ppr_dict env tYCON_PREC ctys) where - (tyvars, rho_ty) = splitForAllTy ty - (theta, body_ty) | show_context = splitRhoTy rho_ty - | otherwise = ([], rho_ty) + Just ctys = maybe_dict + maybe_dict = splitDictTy_maybe ty + + -- NO-ARGUMENT CASE (=> no parens) +ppr_ty env ctxt_prec (TyConApp tycon []) + = ppr tycon + + -- GENERAL CASE +ppr_ty env ctxt_prec (TyConApp tycon tys) + = maybeParen ctxt_prec tYCON_PREC (hsep [ppr tycon, tys_w_spaces]) + where + tys_w_spaces = hsep (map (ppr_ty env tYCON_PREC) tys) - pp_tyvars = brackets (hsep (map (pTyVarB env) tyvars)) + +ppr_ty env ctxt_prec ty@(ForAllTy _ _) + = getPprStyle $ \ sty -> + maybeParen ctxt_prec fUN_PREC $ + if userStyle sty then + sep [ ptext SLIT("forall"), pp_tyvars, ptext SLIT("."), pp_maybe_ctxt, pp_body ] + else + sep [ ptext SLIT("__forall"), brackets pp_tyvars, pp_ctxt, pp_body ] + where + (tyvars, rho_ty) = splitForAllTys ty + (theta, body_ty) = splitRhoTy rho_ty + + pp_tyvars = hsep (map (pBndr env LambdaBind) tyvars) pp_body = ppr_ty env tOP_PREC body_ty + + pp_maybe_ctxt | null theta = empty + | otherwise = pp_ctxt - sty = pStyle env - show_forall = not (userStyle sty) - show_context = ifaceStyle sty || userStyle sty + pp_ctxt = ppr_theta env theta <+> ptext SLIT("=>") -ppr_ty env ctxt_prec (ForAllUsageTy uv uvs ty) - = panic "ppr_ty:ForAllUsageTy" -ppr_ty env ctxt_prec (FunTy ty1 ty2 usage) +ppr_ty env ctxt_prec (FunTy ty1 ty2) -- We fiddle the precedences passed to left/right branches, -- so that right associativity comes out nicely... = maybeParen ctxt_prec fUN_PREC (sep (ppr_ty env fUN_PREC ty1 : pp_rest)) where - (arg_tys, result_ty) = splitFunTy ty2 + (arg_tys, result_ty) = splitFunTys ty2 pp_rest = [ ptext SLIT("-> ") <> ppr_ty env fUN_PREC ty | ty <- arg_tys ++ [result_ty] ] -ppr_ty env ctxt_prec ty@(AppTy _ _) - = ppr_corner env ctxt_prec fun_ty arg_tys - where - (fun_ty, arg_tys) = splitAppTys ty +ppr_ty env ctxt_prec (AppTy ty1 ty2) + = maybeParen ctxt_prec tYCON_PREC $ + ppr_ty env tOP_PREC ty1 <+> ppr_ty env tYCON_PREC ty2 -ppr_ty env ctxt_prec (SynTy tycon tys expansion) - | codeStyle (pStyle env) - -- always expand types that squeak into C-variable names - = ppr_ty env ctxt_prec expansion - - | otherwise - = (<>) - (ppr_app env ctxt_prec (ppr_tycon env tycon) tys) - (ifPprShowAll (pStyle env) (hsep [text " {- expansion:", - ppr_ty env tOP_PREC expansion, - text "-}"])) - -ppr_ty env ctxt_prec (DictTy clas ty usage) - = braces (ppr_dict env tOP_PREC (clas, ty)) - -- Curlies are temporary - - --- Some help functions -ppr_corner env ctxt_prec (TyConTy tycon usage) arg_tys - | isFunTyCon tycon && length arg_tys == 2 - = ppr_ty env ctxt_prec (FunTy ty1 ty2 usage) - where - (ty1:ty2:_) = arg_tys - -ppr_corner env ctxt_prec (TyConTy tycon usage) arg_tys - | isTupleTyCon tycon - && not (codeStyle (pStyle env)) -- no magic in that case - && length arg_tys == tyConArity tycon -- no magic if partially applied - = parens arg_tys_w_commas - where - arg_tys_w_commas = hsep (punctuate comma (map (ppr_ty env tOP_PREC) arg_tys)) - -ppr_corner env ctxt_prec (TyConTy tycon usage) arg_tys - | not (codeStyle (pStyle env)) && uniqueOf tycon == listTyConKey - = ASSERT(length arg_tys == 1) - brackets (ppr_ty env tOP_PREC ty1) - where - (ty1:_) = arg_tys - -ppr_corner env ctxt_prec (TyConTy tycon usage) arg_tys - = ppr_app env ctxt_prec (ppr_tycon env tycon) arg_tys - -ppr_corner env ctxt_prec (TyVarTy tyvar) arg_tys - = ppr_app env ctxt_prec (pTyVarO env tyvar) arg_tys - - -ppr_app env ctxt_prec pp_fun [] - = pp_fun -ppr_app env ctxt_prec pp_fun arg_tys - = maybeParen ctxt_prec tYCON_PREC (hsep [pp_fun, arg_tys_w_spaces]) - where - arg_tys_w_spaces = hsep (map (ppr_ty env tYCON_PREC) arg_tys) +ppr_ty env ctxt_prec (NoteTy (SynNote ty) expansion) + = ppr_ty env ctxt_prec ty +ppr_ty env ctxt_prec (NoteTy (FTVNote _) ty) = ppr_ty env ctxt_prec ty ppr_theta env [] = empty ppr_theta env theta = braces (hsep (punctuate comma (map (ppr_dict env tOP_PREC) theta))) -ppr_dict env ctxt_prec (clas, ty) - = maybeParen ctxt_prec tYCON_PREC - (hsep [ppr_class env clas, ppr_ty env tYCON_PREC ty]) +ppr_dict env ctxt (clas, tys) = ppr clas <+> + hsep (map (ppr_ty env tYCON_PREC) tys) \end{code} \begin{code} - -- This one uses only "ppr" -init_ppr_env sty - = initPprEnv sty b b b b (Just (ppr sty)) (Just (ppr sty)) (Just (ppr sty)) b b b b b +pprTyEnv = initPprEnv b b (Just ppr) b (Just (\site -> pprTyVarBndr)) b where b = panic "PprType:init_ppr_env" - - -- This one uses pprTyVarBndr, and thus is specific to GenTyVar's types -init_ppr_env_type sty - = initPprEnv sty b b b b (Just (pprTyVarBndr sty)) (Just (ppr sty)) (Just (ppr sty)) b b b b b - where - b = panic "PprType:init_ppr_env" - -ppr_tycon env tycon = ppr (pStyle env) tycon -ppr_class env clas = ppr (pStyle env) clas \end{code} %************************************************************************ @@ -266,126 +204,53 @@ ppr_class env clas = ppr (pStyle env) clas %* * %************************************************************************ -\begin{code} -pprGenTyVar sty (TyVar uniq kind maybe_name usage) - = case maybe_name of - -- If the tyvar has a name we can safely use just it, I think - Just n -> pprOccName sty (getOccName n) <> debug_extra - Nothing -> pp_kind <> pprUnique uniq - where - pp_kind = case kind of - TypeKind -> char 'o' - BoxedTypeKind -> char 't' - UnboxedTypeKind -> char 'u' - ArrowKind _ _ -> char 'a' - - debug_extra = case sty of - PprDebug -> pp_debug - PprShowAll -> pp_debug - other -> empty - - pp_debug = text "_" <> pp_kind <> pprUnique uniq -\end{code} - -We print type-variable binders with their kinds in interface files. +We print type-variable binders with their kinds in interface files, +and when in debug mode. \begin{code} -pprTyVarBndr sty@PprInterface tyvar@(TyVar uniq kind name usage) - | not (isBoxedTypeKind kind) - = hcat [pprGenTyVar sty tyvar, text " :: ", pprParendKind kind] - -- See comments with ppDcolon in PprCore.lhs - -pprTyVarBndr sty tyvar = pprGenTyVar sty tyvar -\end{code} - -%************************************************************************ -%* * -\subsection[TyCon]{@TyCon@} -%* * -%************************************************************************ - -ToDo; all this is suspiciously like getOccName! - -\begin{code} -showTyCon :: PprStyle -> TyCon -> String -showTyCon sty tycon = show (pprTyCon sty tycon) +pprTyVarBndr tyvar + = getPprStyle $ \ sty -> + if (ifaceStyle sty || debugStyle sty) && kind /= boxedTypeKind then + hcat [ppr tyvar, text " :: ", pprParendKind kind] + -- See comments with ppDcolon in PprCore.lhs + else + ppr tyvar + where + kind = tyVarKind tyvar -pprTyCon :: PprStyle -> TyCon -> Doc -pprTyCon sty tycon = ppr sty (getName tycon) +pprTyVarBndrs tyvars = hsep (map pprTyVarBndr tyvars) \end{code} - %************************************************************************ %* * \subsection{Mumbo jumbo} %* * %************************************************************************ -\begin{code} - -- Shallowly magical; converts a type into something - -- vaguely close to what can be used in C identifier. - -- Produces things like what we have in mkCompoundName, - -- which can be "dot"ted together... - -getTypeString :: Type -> FAST_STRING - -getTypeString ty - = case (splitAppTys ty) of { (tc, args) -> - _CONCAT_ (do_tc tc : map do_arg_ty args) } - where - do_tc (TyConTy tc _) = nameString (getName tc) - do_tc (SynTy _ _ ty) = do_tc ty - do_tc other = --pprTrace "getTypeString:do_tc:" (pprType PprDebug other) $ - (_PK_ (show (pprType PprForC other))) - - do_arg_ty (TyConTy tc _) = nameString (getName tc) - do_arg_ty (TyVarTy tv) = _PK_ (show (ppr PprForC tv)) - do_arg_ty (SynTy _ _ ty) = do_arg_ty ty - do_arg_ty other = --pprTrace "getTypeString:do_arg_ty:" (pprType PprDebug other) $ - _PK_ (show (pprType PprForC other)) - - -- PprForC expands type synonyms as it goes; - -- it also forces consistent naming of tycons - -- (e.g., can't have both "(,) a b" and "(a,b)": - -- must be consistent! - -specMaybeTysSuffix :: [Maybe Type] -> FAST_STRING -specMaybeTysSuffix ty_maybes - = panic "PprType.specMaybeTysSuffix" -{- LATER: - = let - ty_strs = concat (map typeMaybeString ty_maybes) - dotted_tys = [ _CONS_ '.' str | str <- ty_strs ] - in - _CONCAT_ dotted_tys --} -\end{code} - Grab a name for the type. This is used to determine the type description for profiling. + \begin{code} getTyDescription :: Type -> String getTyDescription ty = case (splitSigmaTy ty) of { (_, _, tau_ty) -> case tau_ty of - TyVarTy _ -> "*" - AppTy fun _ -> getTyDescription fun - FunTy _ res _ -> '-' : '>' : fun_result res - TyConTy tycon _ -> getOccString tycon - SynTy tycon _ _ -> getOccString tycon - DictTy _ _ _ -> "dict" - ForAllTy _ ty -> getTyDescription ty - _ -> pprPanic "getTyDescription: other" (pprType PprDebug tau_ty) + TyVarTy _ -> "*" + AppTy fun _ -> getTyDescription fun + FunTy _ res -> '-' : '>' : fun_result res + TyConApp tycon _ -> getOccString tycon + NoteTy (FTVNote _) ty -> getTyDescription ty + NoteTy (SynNote ty1) _ -> getTyDescription ty1 + ForAllTy _ ty -> getTyDescription ty } where - fun_result (FunTy _ res _) = '>' : fun_result res - fun_result other = getTyDescription other + fun_result (FunTy _ res) = '>' : fun_result res + fun_result other = getTyDescription other \end{code} - %************************************************************************ %* * \subsection{Renumbering types} @@ -398,117 +263,72 @@ consistent Uniques on everything from run to run. \begin{code} nmbrGlobalType :: Type -> Type -- Renumber a top-level type -nmbrGlobalType ty = nmbrType (\tyvar -> tyvar) (\uvar -> uvar) initTyVarUnique ty +nmbrGlobalType ty = nmbrType emptyVarEnv initTyVarUnique ty -nmbrType :: (TyVar -> TyVar) -> (UVar -> UVar) -- Mapping for free vars - -> Unique +nmbrType :: TyVarEnv Type -- Substitution + -> Unique -- This unique and its successors are not + -- free in the range of the substitution -> Type -> Type -nmbrType tyvar_env uvar_env uniq ty - = initNmbr tyvar_env uvar_env uniq (nmbrTy ty) +nmbrType tyvar_env uniq ty + = initNmbr tyvar_env uniq (nmbrTy ty) nmbrTy :: Type -> NmbrM Type nmbrTy (TyVarTy tv) - = lookupTyVar tv `thenNmbr` \ new_tv -> - returnNmbr (TyVarTy new_tv) + = lookupTyVar tv nmbrTy (AppTy t1 t2) = nmbrTy t1 `thenNmbr` \ new_t1 -> nmbrTy t2 `thenNmbr` \ new_t2 -> returnNmbr (AppTy new_t1 new_t2) -nmbrTy (TyConTy tc use) - = nmbrUsage use `thenNmbr` \ new_use -> - returnNmbr (TyConTy tc new_use) +nmbrTy (TyConApp tc tys) + = mapNmbr nmbrTy tys `thenNmbr` \ new_tys -> + returnNmbr (TyConApp tc new_tys) + +nmbrTy (NoteTy (SynNote ty1) ty2) + = nmbrTy ty1 `thenNmbr` \ new_ty1 -> + nmbrTy ty2 `thenNmbr` \ new_ty2 -> + returnNmbr (NoteTy (SynNote new_ty1) new_ty2) -nmbrTy (SynTy tc args expand) - = mapNmbr nmbrTy args `thenNmbr` \ new_args -> - nmbrTy expand `thenNmbr` \ new_expand -> - returnNmbr (SynTy tc new_args new_expand) +nmbrTy (NoteTy (FTVNote _) ty2) = nmbrTy ty2 nmbrTy (ForAllTy tv ty) = addTyVar tv $ \ new_tv -> nmbrTy ty `thenNmbr` \ new_ty -> returnNmbr (ForAllTy new_tv new_ty) -nmbrTy (ForAllUsageTy u us ty) - = addUVar u $ \ new_u -> - mapNmbr lookupUVar us `thenNmbr` \ new_us -> - nmbrTy ty `thenNmbr` \ new_ty -> - returnNmbr (ForAllUsageTy new_u new_us new_ty) - -nmbrTy (FunTy t1 t2 use) +nmbrTy (FunTy t1 t2) = nmbrTy t1 `thenNmbr` \ new_t1 -> nmbrTy t2 `thenNmbr` \ new_t2 -> - nmbrUsage use `thenNmbr` \ new_use -> - returnNmbr (FunTy new_t1 new_t2 new_use) - -nmbrTy (DictTy c ty use) - = nmbrTy ty `thenNmbr` \ new_ty -> - nmbrUsage use `thenNmbr` \ new_use -> - returnNmbr (DictTy c new_ty new_use) - - - -lookupTyVar tyvar (NmbrEnv tv_fn tv_env _ _) uniq - = (uniq, tyvar') - where - tyvar' = case lookupUFM tv_env tyvar of - Just tyvar' -> tyvar' - Nothing -> tv_fn tyvar - -addTyVar tv m (NmbrEnv f_tv tv_ufm f_uv uv_ufm) u - = m tv' nenv u' - where - nenv = NmbrEnv f_tv tv_ufm' f_uv uv_ufm - tv_ufm' = addToUFM tv_ufm tv tv' - tv' = cloneTyVar tv u - u' = incrUnique u -\end{code} - -Usage stuff - -\begin{code} -nmbrUsage (UsageVar v) - = lookupUVar v `thenNmbr` \ v' -> - returnNmbr (UsageVar v) - -nmbrUsage u = returnNmbr u + returnNmbr (FunTy new_t1 new_t2) -lookupUVar uvar (NmbrEnv _ _ uv_fn uv_env) uniq - = (uniq, uvar') +lookupTyVar tyvar env uniq + = (uniq, ty) where - uvar' = case lookupUFM uv_env uvar of - Just uvar' -> uvar' - Nothing -> uv_fn uvar + ty = case lookupVarEnv env tyvar of + Just ty -> ty + Nothing -> TyVarTy tyvar -addUVar uv m (NmbrEnv f_tv tv_ufm f_uv uv_ufm) u - = m uv' nenv u' +addTyVar tv m env u + = m tv' env' u' where - nenv = NmbrEnv f_tv tv_ufm f_uv uv_ufm' - uv_ufm' = addToUFM uv_ufm uv uv' - uv' = cloneUVar uv u - u' = incrUnique u + env' = extendVarEnv env tv (TyVarTy tv') + tv' = setTyVarName tv (setNameVisibility Nothing u (tyVarName tv)) + u' = incrUnique u \end{code} Monad stuff \begin{code} -data NmbrEnv - = NmbrEnv (TyVar -> TyVar) (UniqFM TyVar) -- Global and local map for tyvars - (UVar -> UVar) (UniqFM UVar) -- ... for usage vars +type NmbrM a = TyVarEnv Type -> Unique -> (Unique, a) -- Unique is name supply -type NmbrM a = NmbrEnv -> Unique -> (Unique, a) -- Unique is name supply - -initNmbr :: (TyVar -> TyVar) -> (UVar -> UVar) -> Unique -> NmbrM a -> a -initNmbr tyvar_env uvar_env uniq m - = let - init_nmbr_env = NmbrEnv tyvar_env emptyUFM uvar_env emptyUFM - in - snd (m init_nmbr_env uniq) +initNmbr :: TyVarEnv Type -> Unique -> NmbrM a -> a +initNmbr env uniq m + = snd (m env uniq) returnNmbr x nenv u = (u, x)