%
-% (c) The AQUA Project, Glasgow University, 1996
+% (c) The AQUA Project, Glasgow University, 1996-1998
%
-\section[PprType]{Printing Types, TyVars, Classes, ClassOps, TyCons}
+\section[PprType]{Printing Types, TyVars, Classes, TyCons}
\begin{code}
-#include "HsVersions.h"
-
module PprType(
- GenTyVar, pprGenTyVar,
- TyCon, pprTyCon, showTyCon,
- GenType,
- pprGenType, pprParendGenType,
+ pprKind, pprParendKind,
pprType, pprParendType,
- pprMaybeTy,
- getTypeString,
- typeMaybeString,
- specMaybeTysSuffix,
- GenClass,
- GenClassOp, pprGenClassOp,
-
- addTyVar{-ToDo:don't export-}, nmbrTyVar,
- addUVar, nmbrUsage,
- nmbrType, nmbrTyCon, nmbrClass
+ pprConstraint, pprTheta,
+ pprTyVarBndr, pprTyVarBndrs,
+
+ getTyDescription,
+
+ nmbrType, nmbrGlobalType
) where
-IMP_Ubiq()
-IMPORT_DELOOPER(IdLoop) -- for paranoia checking
-IMPORT_DELOOPER(TyLoop) -- for paranoia checking
+#include "HsVersions.h"
-- friends:
-- (PprType can see all the representations it's trying to print)
-import Type ( GenType(..), maybeAppTyCon,
- splitForAllTy, splitSigmaTy, splitRhoTy, splitAppTy )
-import TyVar ( GenTyVar(..) )
-import TyCon ( TyCon(..), NewOrData )
-import Class ( Class(..), GenClass(..),
- ClassOp(..), GenClassOp(..) )
-import Kind ( Kind(..) )
-import Usage ( GenUsage(..) )
+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 )
import Maybes ( maybeToBool )
-import Name ( isLexVarSym, isLexSpecialSym, isPreludeDefined, origName, moduleOf,
- nameOrigName, nameOf, Name{-instance Outputable-}
- )
-import Outputable ( ifPprShowAll, interpp'SP )
+import Name ( getOccString, setNameVisibility, NamedThing(..) )
+import Outputable
import PprEnv
-import PprStyle ( PprStyle(..), codeStyle, showUserishTypes )
-import Pretty
-import TysWiredIn ( listTyCon )
-import UniqFM ( addToUFM_Directly, lookupUFM_Directly, ufmToList{-ToDo:rm-} )
-import Unique ( pprUnique10, pprUnique, incrUnique )
-import Usage ( UVar(..), pprUVar )
+import Unique ( Unique, Uniquable(..),
+ incrUnique, listTyConKey, initTyVarUnique
+ )
import Util
\end{code}
-\begin{code}
-instance (Eq tyvar, Outputable tyvar,
- Eq uvar, Outputable uvar ) => Outputable (GenType tyvar uvar) where
- 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 ty => Outputable (GenClassOp ty) where
- ppr sty clsop = pprGenClassOp sty clsop
-
-instance Outputable (GenTyVar flexi) where
- ppr sty tv = pprGenTyVar sty tv
-
--- and two SPECIALIZEd ones:
-instance Outputable {-Type, i.e.:-}(GenType TyVar UVar) where
- ppr sty ty = pprGenType sty ty
-
-instance Outputable {-TyVar, i.e.:-}(GenTyVar Usage) where
- ppr sty ty = pprGenTyVar sty ty
-\end{code}
-
%************************************************************************
%* *
-\subsection[Type]{@Type@}
+\subsection{The external interface}
%* *
%************************************************************************
-@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@
+@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}
-pprGenType, pprParendGenType :: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar)
- => PprStyle -> GenType tyvar uvar -> Pretty
-
-pprGenType sty ty = ppr_ty sty (init_ppr_env sty) tOP_PREC ty
-pprParendGenType sty ty = ppr_ty sty (init_ppr_env sty) tYCON_PREC ty
-
-pprType sty ty = ppr_ty sty (init_ppr_env sty) tOP_PREC (ty :: Type)
-pprParendType sty ty = ppr_ty sty (init_ppr_env sty) tYCON_PREC (ty :: Type)
-
-pprMaybeTy :: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar)
- => PprStyle -> Maybe (GenType tyvar uvar) -> Pretty
-pprMaybeTy sty Nothing = ppChar '*'
-pprMaybeTy sty (Just ty) = pprParendGenType sty ty
-\end{code}
-
-\begin{code}
-ppr_ty :: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar)
- => PprStyle -> PprEnv tyvar uvar bndr occ -> Int
- -> GenType tyvar uvar
- -> Pretty
-
-ppr_ty sty env ctxt_prec (TyVarTy tyvar)
- = ppr_tyvar env tyvar
+pprType, pprParendType :: GenType flexi -> SDoc
+pprType ty = ppr_ty pprTyEnv tOP_PREC ty
+pprParendType ty = ppr_ty pprTyEnv tYCON_PREC ty
-ppr_ty sty env ctxt_prec (TyConTy tycon usage)
- = ppr sty tycon
+pprKind, pprParendKind :: Kind -> SDoc
+pprKind = pprType
+pprParendKind = pprParendType
-ppr_ty sty env ctxt_prec ty@(ForAllTy _ _)
- | showUserishTypes sty = ppr_ty sty env' ctxt_prec body_ty
-
- | otherwise = ppSep [ ppPStr SLIT("_forall_"),
- ppIntersperse pp'SP pp_tyvars,
- ppPStr SLIT("=>"),
- ppr_ty sty env' ctxt_prec body_ty
- ]
- where
- (tyvars, body_ty) = splitForAllTy ty
- env' = foldl add_tyvar env tyvars
- pp_tyvars = map (ppr_tyvar env') tyvars
-
-ppr_ty sty env ctxt_prec (ForAllUsageTy uv uvs ty)
- = panic "ppr_ty:ForAllUsageTy"
-
-ppr_ty sty env ctxt_prec ty@(FunTy (DictTy _ _ _) _ _)
- | showUserishTypes sty
- -- Print a nice looking context (Eq a, Text b) => ...
- = ppSep [ppBeside (ppr_theta theta) (ppPStr SLIT(" =>")),
- ppr_ty sty env ctxt_prec body_ty
- ]
- where
- (theta, body_ty) = splitRhoTy ty
+pprConstraint :: Class -> [GenType flexi] -> SDoc
+pprConstraint clas tys = ppr clas <+> hsep (map (pprParendType) tys)
- ppr_theta [ct] = ppr_dict sty env tOP_PREC ct
- ppr_theta cts = ppParens (ppInterleave ppComma (map (ppr_dict sty env tOP_PREC) cts))
+pprTheta :: ThetaType -> SDoc
+pprTheta theta = parens (hsep (punctuate comma (map ppr_dict theta)))
+ where
+ ppr_dict (c,tys) = pprConstraint c tys
-ppr_ty sty env ctxt_prec (FunTy ty1 ty2 usage)
- -- We fiddle the precedences passed to left/right branches,
- -- so that right associativity comes out nicely...
- = maybeParen ctxt_prec fUN_PREC
- (ppCat [ppr_ty sty env fUN_PREC ty1,
- ppPStr SLIT("->"),
- ppr_ty sty env tOP_PREC ty2])
-
-ppr_ty sty env ctxt_prec ty@(AppTy _ _)
- = ppr_corner sty env ctxt_prec fun_ty arg_tys
- where
- (fun_ty, arg_tys) = splitAppTy ty
-
-ppr_ty PprInterface env ctxt_prec (SynTy tycon tys expansion)
- -- always expand types in an interface
- = ppr_ty PprInterface env ctxt_prec expansion
-
-ppr_ty sty env ctxt_prec (SynTy tycon tys expansion)
- = ppBeside
- (ppr_app sty env ctxt_prec (ppr sty tycon) tys)
- (ifPprShowAll sty (ppCat [ppStr " {- expansion:",
- ppr_ty sty env tOP_PREC expansion,
- ppStr "-}"]))
-
-ppr_ty sty env ctxt_prec (DictTy clas ty usage)
- = ppr_dict sty env ctxt_prec (clas, ty)
-
-
--- Some help functions
-ppr_corner sty env ctxt_prec (TyConTy FunTyCon usage) arg_tys
- | length arg_tys == 2
- = ppr_ty sty env ctxt_prec (FunTy ty1 ty2 usage)
- where
- (ty1:ty2:_) = arg_tys
-
-ppr_corner sty env ctxt_prec (TyConTy (TupleTyCon _ _ a) usage) arg_tys
- = --ASSERT(length arg_tys == a)
- (if (length arg_tys /= a) then pprTrace "ppr_corner:" (ppCat [ppInt a, ppInterleave ppComma (map (pprGenType PprDebug) arg_tys)]) else id) $
- ppBesides [ppLparen, arg_tys_w_commas, ppRparen]
- where
- arg_tys_w_commas = ppIntersperse pp'SP (map (ppr_ty sty env tOP_PREC) arg_tys)
-
-ppr_corner sty env ctxt_prec (TyConTy tycon usage) arg_tys
- | tycon == listTyCon
- = ASSERT(length arg_tys == 1)
- ppBesides [ppLbrack, ppr_ty sty env tOP_PREC ty1, ppRbrack]
- where
- (ty1:_) = arg_tys
-
-ppr_corner sty env ctxt_prec (TyConTy tycon usage) arg_tys
- = ppr_app sty env ctxt_prec (ppr sty tycon) arg_tys
-
-ppr_corner sty env ctxt_prec (TyVarTy tyvar) arg_tys
- = ppr_app sty env ctxt_prec (ppr_tyvar env tyvar) arg_tys
-
-
-ppr_app sty env ctxt_prec pp_fun []
- = pp_fun
-ppr_app sty env ctxt_prec pp_fun arg_tys
- = maybeParen ctxt_prec tYCON_PREC (ppCat [pp_fun, arg_tys_w_spaces])
- where
- arg_tys_w_spaces = ppIntersperse ppSP (map (ppr_ty sty env tYCON_PREC) arg_tys)
-
-
-ppr_dict sty env ctxt_prec (clas, ty)
- = maybeParen ctxt_prec tYCON_PREC
- (ppCat [ppr sty clas, ppr_ty sty env tYCON_PREC ty])
+instance Outputable (GenType flexi) where
+ ppr ty = pprType ty
\end{code}
-This stuff is effectively stubbed out for the time being
-(WDP 960425):
-\begin{code}
-init_ppr_env sty
- = initPprEnv sty b b b b b b b b b b b
- where
- b = panic "PprType:init_ppr_env"
-
-ppr_tyvar env tyvar = ppr (pStyle env) tyvar
-ppr_uvar env uvar = ppr (pStyle env) uvar
-add_tyvar env tyvar = env
-add_uvar env uvar = env
-\end{code}
+%************************************************************************
+%* *
+\subsection{Pretty printing}
+%* *
+%************************************************************************
+Precedence
+~~~~~~~~~~
@ppr_ty@ takes an @Int@ that is the precedence of the context.
The precedence levels are:
\begin{description}
-\item[0:] What we start with.
-\item[1:] Function application (@FunTys@).
-\item[2:] Type constructors.
+\item[tOP_PREC] No parens required.
+\item[fUN_PREC] Left hand argument of a function arrow.
+\item[tYCON_PREC] Argument of a type constructor.
\end{description}
maybeParen ctxt_prec inner_prec pretty
| ctxt_prec < inner_prec = pretty
- | otherwise = ppParens pretty
+ | otherwise = parens pretty
\end{code}
-%************************************************************************
-%* *
-\subsection[TyVar]{@TyVar@}
-%* *
-%************************************************************************
-
\begin{code}
-pprGenTyVar sty (TyVar uniq kind name usage)
- = case sty of
- PprInterface -> pp_u
- _ -> ppBesides [pp_name, ppStr "{-", pp_u, ppStr "-}"]
+ppr_ty :: PprEnv (GenTyVar flexi) flexi -> Int
+ -> GenType flexi
+ -> SDoc
+
+ppr_ty env ctxt_prec (TyVarTy tyvar)
+ = pTyVarO env tyvar
+
+ -- 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
+
+ | isUnboxedTupleTyCon tycon
+ && length tys == tyConArity tycon -- no magic if partially applied
+ = parens (char '#' <+> tys_w_commas <+> char '#')
where
- pp_u = pprUnique uniq
- pp_name = case name of
- Just n -> ppPStr (nameOf (nameOrigName n))
- Nothing -> case kind of
- TypeKind -> ppChar 'o'
- BoxedTypeKind -> ppChar 't'
- UnboxedTypeKind -> ppChar 'u'
- ArrowKind _ _ -> ppChar 'a'
-\end{code}
-
-%************************************************************************
-%* *
-\subsection[TyCon]{@TyCon@}
-%* *
-%************************************************************************
+ 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
+ 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)
+
+
+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
+
+ pp_ctxt = ppr_theta env theta <+> ptext SLIT("=>")
+
+
+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) = splitFunTys ty2
+ pp_rest = [ ptext SLIT("-> ") <> ppr_ty env fUN_PREC ty | ty <- arg_tys ++ [result_ty] ]
-ToDo; all this is suspiciously like getOccName!
+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
-\begin{code}
-showTyCon :: PprStyle -> TyCon -> String
-showTyCon sty tycon = ppShow 80 (pprTyCon sty tycon)
+ppr_ty env ctxt_prec (NoteTy (SynNote ty) expansion)
+ = ppr_ty env ctxt_prec ty
-pprTyCon :: PprStyle -> TyCon -> Pretty
+ppr_ty env ctxt_prec (NoteTy (FTVNote _) ty) = ppr_ty env ctxt_prec ty
-pprTyCon sty FunTyCon = ppStr "(->)"
-pprTyCon sty (TupleTyCon _ name _) = ppr sty name
-pprTyCon sty (PrimTyCon _ name _ _) = ppr sty name
+ppr_theta env [] = empty
+ppr_theta env theta = braces (hsep (punctuate comma (map (ppr_dict env tOP_PREC) theta)))
-pprTyCon sty tycon@(DataTyCon uniq name kind tyvars ctxt cons derivings nd)
- = ppr sty name
+ppr_dict env ctxt (clas, tys) = ppr clas <+>
+ hsep (map (ppr_ty env tYCON_PREC) tys)
+\end{code}
-pprTyCon sty (SpecTyCon tc ty_maybes)
- = ppBeside (pprTyCon sty tc)
- (if (codeStyle sty)
- then identToC tys_stuff
- else ppPStr tys_stuff)
+\begin{code}
+pprTyEnv = initPprEnv b b (Just ppr) b (Just (\site -> pprTyVarBndr)) b
where
- tys_stuff = specMaybeTysSuffix ty_maybes
-
-pprTyCon sty (SynTyCon uniq name kind arity tyvars expansion)
- = ppBeside (ppr sty name)
- (ifPprShowAll sty
- (ppCat [ ppStr " {-",
- ppInt arity,
- interpp'SP sty tyvars,
- pprParendGenType sty expansion,
- ppStr "-}"]))
+ b = panic "PprType:init_ppr_env"
\end{code}
-
%************************************************************************
%* *
-\subsection[Class]{@Class@}
+\subsection[TyVar]{@TyVar@}
%* *
%************************************************************************
-\begin{code}
-pprGenClassOp :: Outputable ty => PprStyle -> GenClassOp ty -> Pretty
-
-pprGenClassOp sty op = ppr_class_op sty [] op
+We print type-variable binders with their kinds in interface files,
+and when in debug mode.
-ppr_class_op sty tyvars (ClassOp op_name i ty)
- = case sty of
- PprForC -> pp_C
- PprForAsm _ _ -> pp_C
- PprInterface -> ppCat [pp_user, ppPStr SLIT("::"), ppr sty ty]
- PprShowAll -> ppCat [pp_user, ppPStr SLIT("::"), ppr sty ty]
- _ -> pp_user
+\begin{code}
+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
- pp_C = ppPStr op_name
- pp_user = if isLexVarSym op_name && not (isLexSpecialSym op_name)
- then ppParens pp_C
- else pp_C
+ kind = tyVarKind tyvar
+
+pprTyVarBndrs tyvars = hsep (map pprTyVarBndr tyvars)
\end{code}
%* *
%************************************************************************
+Grab a name for the type. This is used to determine the type
+description for profiling.
+
\begin{code}
- -- Shallowly magical; converts a type into something
- -- vaguely close to what can be used in C identifier.
- -- Don't forget to include the module name!!!
-getTypeString :: Type -> [FAST_STRING]
-getTypeString ty
- | is_prelude_ty = [string]
- | otherwise = [mod, string]
+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
+ TyConApp tycon _ -> getOccString tycon
+ NoteTy (FTVNote _) ty -> getTyDescription ty
+ NoteTy (SynNote ty1) _ -> getTyDescription ty1
+ ForAllTy _ ty -> getTyDescription ty
+ }
where
- string = _PK_ (tidy (ppShow 1000 ppr_t))
- ppr_t = pprGenType PprForC ty
- -- PprForC expands type synonyms as it goes
-
- (is_prelude_ty, mod)
- = case (maybeAppTyCon ty) of
- Nothing -> true_bottom
- Just (tycon,_) ->
- if isPreludeDefined tycon
- then true_bottom
- else (False, moduleOf (origName tycon))
-
- true_bottom = (True, panic "getTypeString")
+ fun_result (FunTy _ res) = '>' : fun_result res
+ fun_result other = getTyDescription other
+\end{code}
- --------------------------------------------------
- -- tidy: very ad-hoc
- tidy [] = [] -- done
- tidy (' ' : more)
- = case more of
- ' ' : _ -> tidy more
- '-' : '>' : xs -> '-' : '>' : tidy (no_leading_sps xs)
- other -> ' ' : tidy more
+%************************************************************************
+%* *
+\subsection{Renumbering types}
+%* *
+%************************************************************************
- tidy (',' : more) = ',' : tidy (no_leading_sps more)
+We tend to {\em renumber} everything before printing, so that we get
+consistent Uniques on everything from run to run.
- tidy (x : xs) = x : tidy xs -- catch all
- no_leading_sps [] = []
- no_leading_sps (' ':xs) = no_leading_sps xs
- no_leading_sps other = other
+\begin{code}
+nmbrGlobalType :: Type -> Type -- Renumber a top-level type
+nmbrGlobalType ty = nmbrType emptyVarEnv initTyVarUnique ty
-typeMaybeString :: Maybe Type -> [FAST_STRING]
-typeMaybeString Nothing = [SLIT("!")]
-typeMaybeString (Just t) = getTypeString t
+nmbrType :: TyVarEnv Type -- Substitution
+ -> Unique -- This unique and its successors are not
+ -- free in the range of the substitution
+ -> Type
+ -> Type
-specMaybeTysSuffix :: [Maybe Type] -> FAST_STRING
-specMaybeTysSuffix ty_maybes
- = let
- ty_strs = concat (map typeMaybeString ty_maybes)
- dotted_tys = [ _CONS_ '.' str | str <- ty_strs ]
- in
- _CONCAT_ dotted_tys
-\end{code}
+nmbrType tyvar_env uniq ty
+ = initNmbr tyvar_env uniq (nmbrTy ty)
-ToDo: possibly move:
-\begin{code}
-nmbrType :: Type -> NmbrM Type
+nmbrTy :: Type -> NmbrM Type
-nmbrType (TyVarTy tv)
- = nmbrTyVar tv `thenNmbr` \ new_tv ->
- returnNmbr (TyVarTy new_tv)
+nmbrTy (TyVarTy tv)
+ = lookupTyVar tv
-nmbrType (AppTy t1 t2)
- = nmbrType t1 `thenNmbr` \ new_t1 ->
- nmbrType t2 `thenNmbr` \ new_t2 ->
+nmbrTy (AppTy t1 t2)
+ = nmbrTy t1 `thenNmbr` \ new_t1 ->
+ nmbrTy t2 `thenNmbr` \ new_t2 ->
returnNmbr (AppTy new_t1 new_t2)
-nmbrType (TyConTy tc use)
- = --nmbrTyCon tc `thenNmbr` \ new_tc ->
- 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)
-nmbrType (SynTy tc args expand)
- = --nmbrTyCon tc `thenNmbr` \ new_tc ->
- mapNmbr nmbrType args `thenNmbr` \ new_args ->
- nmbrType expand `thenNmbr` \ new_expand ->
- returnNmbr (SynTy tc new_args new_expand)
+nmbrTy (NoteTy (SynNote ty1) ty2)
+ = nmbrTy ty1 `thenNmbr` \ new_ty1 ->
+ nmbrTy ty2 `thenNmbr` \ new_ty2 ->
+ returnNmbr (NoteTy (SynNote new_ty1) new_ty2)
-nmbrType (ForAllTy tv ty)
- = addTyVar tv `thenNmbr` \ new_tv ->
- nmbrType ty `thenNmbr` \ new_ty ->
+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)
-nmbrType (ForAllUsageTy u us ty)
- = addUVar u `thenNmbr` \ new_u ->
- mapNmbr nmbrUVar us `thenNmbr` \ new_us ->
- nmbrType ty `thenNmbr` \ new_ty ->
- returnNmbr (ForAllUsageTy new_u new_us new_ty)
-
-nmbrType (FunTy t1 t2 use)
- = nmbrType t1 `thenNmbr` \ new_t1 ->
- nmbrType t2 `thenNmbr` \ new_t2 ->
- nmbrUsage use `thenNmbr` \ new_use ->
- returnNmbr (FunTy new_t1 new_t2 new_use)
-
-nmbrType (DictTy c ty use)
- = --nmbrClass c `thenNmbr` \ new_c ->
- nmbrType ty `thenNmbr` \ new_ty ->
- nmbrUsage use `thenNmbr` \ new_use ->
- returnNmbr (DictTy c new_ty new_use)
-\end{code}
+nmbrTy (FunTy t1 t2)
+ = nmbrTy t1 `thenNmbr` \ new_t1 ->
+ nmbrTy t2 `thenNmbr` \ new_t2 ->
+ returnNmbr (FunTy new_t1 new_t2)
-\begin{code}
-addTyVar, nmbrTyVar :: TyVar -> NmbrM TyVar
-
-addTyVar tv@(TyVar u k maybe_name use) nenv@(NmbrEnv ui ut uu idenv tvenv uvenv)
- = --pprTrace "addTyVar:" (ppCat [pprUnique u, pprUnique ut]) $
- case (lookupUFM_Directly tvenv u) of
- Just xx -> -- pprTrace "addTyVar: already in map!" (ppr PprDebug tv) $
- -- (It gets triggered when we do a datatype: first we
- -- "addTyVar" the tyvars for the datatype as a whole;
- -- we will subsequently "addId" the data cons, including
- -- the type for each of them -- each of which includes
- -- _forall_ ...tvs..., which we will addTyVar.
- -- Harmless, if that's all that happens....
- (nenv, xx)
- Nothing ->
- let
- nenv_plus_tv = NmbrEnv ui (incrUnique ut) uu
- idenv
- (addToUFM_Directly tvenv u new_tv)
- uvenv
-
- (nenv2, new_use) = nmbrUsage use nenv_plus_tv
-
- new_tv = TyVar ut k maybe_name new_use
- in
- (nenv2, new_tv)
-
-nmbrTyVar tv@(TyVar u _ _ _) nenv@(NmbrEnv ui ut uu idenv tvenv uvenv)
- = case (lookupUFM_Directly tvenv u) of
- Just xx -> (nenv, xx)
- Nothing ->
- pprTrace "nmbrTyVar: lookup failed:" (ppCat (ppr PprDebug u : [ppCat [ppr PprDebug x, ppStr "=>", ppr PprDebug tv] | (x,tv) <- ufmToList tvenv])) $
- (nenv, tv)
-\end{code}
-nmbrTyCon : only called from ``top-level'', if you know what I mean.
-\begin{code}
-nmbrTyCon tc@FunTyCon = returnNmbr tc
-nmbrTyCon tc@(TupleTyCon _ _ _) = returnNmbr tc
-nmbrTyCon tc@(PrimTyCon _ _ _ _) = returnNmbr tc
-
-nmbrTyCon (DataTyCon u n k tvs theta cons clss nod)
- = --pprTrace "nmbrDataTyCon:" (ppCat (map (ppr PprDebug) tvs)) $
- mapNmbr addTyVar tvs `thenNmbr` \ new_tvs ->
- mapNmbr nmbr_theta theta `thenNmbr` \ new_theta ->
- mapNmbr nmbrId cons `thenNmbr` \ new_cons ->
- returnNmbr (DataTyCon u n k new_tvs new_theta new_cons clss nod)
+lookupTyVar tyvar env uniq
+ = (uniq, ty)
where
- nmbr_theta (c,t)
- = --nmbrClass c `thenNmbr` \ new_c ->
- nmbrType t `thenNmbr` \ new_t ->
- returnNmbr (c, new_t)
-
-nmbrTyCon (SynTyCon u n k a tvs expand)
- = mapNmbr addTyVar tvs `thenNmbr` \ new_tvs ->
- nmbrType expand `thenNmbr` \ new_expand ->
- returnNmbr (SynTyCon u n k a new_tvs new_expand)
-
-nmbrTyCon (SpecTyCon tc specs)
- = mapNmbr nmbrMaybeTy specs `thenNmbr` \ new_specs ->
- returnNmbr (SpecTyCon tc new_specs)
-
------------
-nmbrMaybeTy Nothing = returnNmbr Nothing
-nmbrMaybeTy (Just t) = nmbrType t `thenNmbr` \ new_t ->
- returnNmbr (Just new_t)
-\end{code}
+ ty = case lookupVarEnv env tyvar of
+ Just ty -> ty
+ Nothing -> TyVarTy tyvar
-\begin{code}
-nmbrClass (Class u n tv supers ssels ops osels odefms instenv isupers)
- = addTyVar tv `thenNmbr` \ new_tv ->
- mapNmbr nmbr_op ops `thenNmbr` \ new_ops ->
- returnNmbr (Class u n new_tv supers ssels new_ops osels odefms instenv isupers)
+addTyVar tv m env u
+ = m tv' env' u'
where
- nmbr_op (ClassOp n tag ty)
- = nmbrType ty `thenNmbr` \ new_ty ->
- returnNmbr (ClassOp n tag new_ty)
+ env' = extendVarEnv env tv (TyVarTy tv')
+ tv' = setTyVarName tv (setNameVisibility Nothing u (tyVarName tv))
+ u' = incrUnique u
\end{code}
-\begin{code}
-nmbrUsage :: Usage -> NmbrM Usage
-
-nmbrUsage u = returnNmbr u
-{- LATER:
-nmbrUsage u@UsageOne = returnNmbr u
-nmbrUsage u@UsageOmega = returnNmbr u
-nmbrUsage (UsageVar u)
- = nmbrUVar u `thenNmbr` \ new_u ->
- returnNmbr (UsageVar new_u)
--}
-\end{code}
+Monad stuff
\begin{code}
-addUVar, nmbrUVar :: UVar -> NmbrM UVar
-
-addUVar u nenv@(NmbrEnv ui ut uu idenv tvenv uvenv)
- = case (lookupUFM_Directly uvenv u) of
- Just xx -> _trace "addUVar: already in map!" $
- (nenv, xx)
- Nothing ->
- let
- nenv_plus_uv = NmbrEnv ui ut (incrUnique uu)
- idenv
- tvenv
- (addToUFM_Directly uvenv u new_uv)
- new_uv = uu
- in
- (nenv_plus_uv, new_uv)
-
-nmbrUVar u nenv@(NmbrEnv ui ut uu idenv tvenv uvenv)
- = case (lookupUFM_Directly uvenv u) of
- Just xx -> (nenv, xx)
- Nothing ->
- _trace "nmbrUVar: lookup failed" $
- (nenv, u)
+type NmbrM a = TyVarEnv Type -> Unique -> (Unique, a) -- Unique is name supply
+
+initNmbr :: TyVarEnv Type -> Unique -> NmbrM a -> a
+initNmbr env uniq m
+ = snd (m env uniq)
+
+returnNmbr x nenv u = (u, x)
+
+thenNmbr m k nenv u
+ = let
+ (u', res) = m nenv u
+ in
+ k res nenv u'
+
+
+mapNmbr f [] = returnNmbr []
+mapNmbr f (x:xs)
+ = f x `thenNmbr` \ r ->
+ mapNmbr f xs `thenNmbr` \ rs ->
+ returnNmbr (r:rs)
\end{code}
projects / ghc-hetmet.git / blobdiff