\begin{code}
module Type (
- GenType(..), Type,
+ Type(..), TyNote(..), -- Representation visible to friends
+ Kind, TyVarSubst,
+
+ superKind, superBoxity, -- :: SuperKind
+
+ boxedKind, -- :: Kind :: BX
+ anyBoxKind, -- :: Kind :: BX
+ typeCon, -- :: KindCon :: BX -> KX
+ anyBoxCon, -- :: KindCon :: BX
+
+ boxedTypeKind, unboxedTypeKind, openTypeKind, -- Kind :: superKind
+
+ mkArrowKind, mkArrowKinds, hasMoreBoxityInfo,
+
+ funTyCon,
mkTyVarTy, mkTyVarTys, getTyVar, getTyVar_maybe, isTyVarTy,
- mkAppTy, mkAppTys, splitAppTy, splitAppTys,
+ mkAppTy, mkAppTys, splitAppTy, splitAppTys, splitAppTy_maybe,
- mkFunTy, mkFunTys, splitFunTy_maybe, splitFunTys,
+ mkFunTy, mkFunTys, splitFunTy_maybe, splitFunTys, funResultTy,
+ zipFunTys,
mkTyConApp, mkTyConTy, splitTyConApp_maybe,
splitAlgTyConApp_maybe, splitAlgTyConApp,
mkDictTy, splitDictTy_maybe, isDictTy,
- mkSynTy, isSynTy,
+ mkSynTy, isSynTy, deNoteType,
mkForAllTy, mkForAllTys, splitForAllTy_maybe, splitForAllTys,
- applyTy, applyTys,
+ applyTy, applyTys, isForAllTy,
+ mkPiType,
TauType, RhoType, SigmaType, ThetaType,
isTauTy,
mkRhoTy, splitRhoTy,
mkSigmaTy, splitSigmaTy,
- isUnpointedType, isUnboxedType, typePrimRep,
-
- matchTy, matchTys,
+ -- Lifting and boxity
+ isUnLiftedType, isUnboxedType, isUnboxedTupleType, isAlgType, isDataType,
+ typePrimRep,
+ -- Free variables
tyVarsOfType, tyVarsOfTypes, namesOfType, typeKind,
+ addFreeTyVars,
- instantiateTy, instantiateTauTy, instantiateThetaTy,
+ -- Substitution
+ substTy, substTheta, fullSubstTy, substTyVar,
+ substTopTy, substTopTheta,
- showTypeCategory
+ -- Tidying up for printing
+ tidyType, tidyTypes,
+ tidyOpenType, tidyOpenTypes,
+ tidyTyVar, tidyTyVars,
+ tidyTopType
) where
#include "HsVersions.h"
-import {-# SOURCE #-} Id ( Id )
+import {-# SOURCE #-} DataCon( DataCon )
+import {-# SOURCE #-} PprType( pprType ) -- Only called in debug messages
-- friends:
+import Var ( Id, TyVar, IdOrTyVar,
+ tyVarKind, isId, idType, setVarOcc
+ )
+import VarEnv
+import VarSet
+
+import Name ( NamedThing(..), Provenance(..), ExportFlag(..),
+ mkWiredInTyConName, mkGlobalName, tcOcc,
+ tidyOccName, TidyOccEnv
+ )
+import NameSet
import Class ( classTyCon, Class )
-import Kind ( mkBoxedTypeKind, resultKind, Kind )
-import TyCon ( mkFunTyCon, isFunTyCon, isEnumerationTyCon, isTupleTyCon, maybeTyConSingleCon,
- isPrimTyCon, isAlgTyCon, isSynTyCon, tyConArity,
+import TyCon ( TyCon, KindCon,
+ mkFunTyCon, mkKindCon, mkSuperKindCon,
+ matchesTyCon, isUnboxedTupleTyCon, isUnLiftedTyCon,
+ isFunTyCon, isDataTyCon,
+ isAlgTyCon, isSynTyCon, tyConArity,
tyConKind, tyConDataCons, getSynTyConDefn,
- tyConPrimRep, tyConClass_maybe, TyCon )
-import TyVar ( GenTyVarSet, TyVarEnv, GenTyVar, TyVar,
- tyVarKind, emptyTyVarSet, unionTyVarSets, minusTyVarSet,
- unitTyVarSet, lookupTyVarEnv, delFromTyVarEnv, zipTyVarEnv, mkTyVarEnv,
- emptyTyVarEnv, isEmptyTyVarEnv, addToTyVarEnv )
-import Name ( NamedThing(..),
- NameSet(..), unionNameSets, emptyNameSet, unitNameSet, minusNameSet
+ tyConPrimRep, tyConClass_maybe
)
-- others
-import BasicTypes ( Unused )
-import Maybes ( maybeToBool, assocMaybe )
-import PrimRep ( PrimRep(..) )
-import Unique -- quite a few *Keys
-import Util ( thenCmp, panic, assertPanic )
+import BasicTypes ( Unused )
+import SrcLoc ( mkBuiltinSrcLoc )
+import PrelMods ( pREL_GHC )
+import Maybes ( maybeToBool )
+import PrimRep ( PrimRep(..), isFollowableRep )
+import Unique -- quite a few *Keys
+import Util ( thenCmp, mapAccumL )
+import Outputable
+
\end{code}
+%************************************************************************
+%* *
+\subsection{Type Classifications}
+%* *
+%************************************************************************
+
+A type is
+
+ *unboxed* iff its representation is other than a pointer
+ Unboxed types cannot instantiate a type variable
+ Unboxed types are always unlifted.
+
+ *lifted* A type is lifted iff it has bottom as an element.
+ Closures always have lifted types: i.e. any
+ let-bound identifier in Core must have a lifted
+ type. Operationally, a lifted object is one that
+ can be entered.
+ (NOTE: previously "pointed").
+
+ *algebraic* A type with one or more constructors, whether declared
+ with "data" or "newtype".
+ An algebraic type is one that can be deconstructed
+ with a case expression.
+
+ *NOT* the same as lifted types, because we also
+ include unboxed tuples in this classification.
+
+ *data* A type declared with "data". Also boxed tuples.
+
+ *primitive* iff it is a built-in type that can't be expressed
+ in Haskell.
+
+Currently, all primitive types are unlifted, but that's not necessarily
+the case. (E.g. Int could be primitive.)
+
+Some primitive types are unboxed, such as Int#, whereas some are boxed
+but unlifted (such as ByteArray#). The only primitive types that we
+classify as algebraic are the unboxed tuples.
+
+examples of type classifications:
+Type primitive boxed lifted algebraic
+-----------------------------------------------------------------------------
+Int#, Yes No No No
+ByteArray# Yes Yes No No
+(# a, b #) Yes No No Yes
+( a, b ) No Yes Yes Yes
+[a] No Yes Yes Yes
%************************************************************************
%* *
\begin{code}
-type Type = GenType Unused -- Used after typechecker
+type SuperKind = Type
+type Kind = Type
-data GenType flexi -- Parameterised over the "flexi" part of a type variable
- = TyVarTy (GenTyVar flexi)
+type TyVarSubst = TyVarEnv Type
+
+data Type
+ = TyVarTy TyVar
| AppTy
- (GenType flexi) -- Function is *not* a TyConApp
- (GenType flexi)
+ Type -- Function is *not* a TyConApp
+ Type
| TyConApp -- Application of a TyCon
TyCon -- *Invariant* saturated appliations of FunTyCon and
-- synonyms have their own constructors, below.
- [GenType flexi] -- Might not be saturated.
+ [Type] -- Might not be saturated.
| FunTy -- Special case of TyConApp: TyConApp FunTyCon [t1,t2]
- (GenType flexi)
- (GenType flexi)
+ Type
+ Type
- | SynTy -- Saturated application of a type synonym
- (GenType flexi) -- The unexpanded version; always a TyConTy
- (GenType flexi) -- The expanded version
+ | NoteTy -- Saturated application of a type synonym
+ TyNote
+ Type -- The expanded version
| ForAllTy
- (GenTyVar flexi)
- (GenType flexi) -- TypeKind
+ TyVar
+ Type -- TypeKind
+
+data TyNote
+ = SynNote Type -- The unexpanded version of the type synonym; always a TyConApp
+ | FTVNote TyVarSet -- The free type variables of the noted expression
+\end{code}
+
+
+%************************************************************************
+%* *
+\subsection{Kinds}
+%* *
+%************************************************************************
+
+Kinds
+~~~~~
+k::K = Type bx
+ | k -> k
+ | kv
+
+kv :: KX is a kind variable
+
+Type :: BX -> KX
+
+bx::BX = Boxed
+ | Unboxed
+ | AnyBox -- Used *only* for special built-in things
+ -- like error :: forall (a::*?). String -> a
+ -- Here, the 'a' can be instantiated to a boxed or
+ -- unboxed type.
+ | bv
+
+bxv :: BX is a boxity variable
+
+sk = KX -- A kind
+ | BX -- A boxity
+ | sk -> sk -- In ptic (BX -> KX)
+
+\begin{code}
+mk_kind_name key str = mkGlobalName key pREL_GHC (tcOcc str)
+ (LocalDef mkBuiltinSrcLoc NotExported)
+ -- mk_kind_name is a bit of a hack
+ -- The LocalDef means that we print the name without
+ -- a qualifier, which is what we want for these kinds.
+ -- It's used for both Kinds and Boxities
+\end{code}
+
+Define KX, BX.
+
+\begin{code}
+superKind :: SuperKind -- KX, the type of all kinds
+superKindName = mk_kind_name kindConKey SLIT("KX")
+superKind = TyConApp (mkSuperKindCon superKindName) []
+
+superBoxity :: SuperKind -- BX, the type of all boxities
+superBoxityName = mk_kind_name boxityConKey SLIT("BX")
+superBoxity = TyConApp (mkSuperKindCon superBoxityName) []
+\end{code}
+
+Define Boxed, Unboxed, AnyBox
+
+\begin{code}
+boxedKind, unboxedKind, anyBoxKind :: Kind -- Of superkind superBoxity
+
+boxedConName = mk_kind_name boxedConKey SLIT("*")
+boxedKind = TyConApp (mkKindCon boxedConName superBoxity) []
+
+unboxedConName = mk_kind_name unboxedConKey SLIT("#")
+unboxedKind = TyConApp (mkKindCon unboxedConName superBoxity) []
+
+anyBoxConName = mk_kind_name anyBoxConKey SLIT("?")
+anyBoxCon = mkKindCon anyBoxConName superBoxity -- A kind of wild card
+anyBoxKind = TyConApp anyBoxCon []
+\end{code}
+
+Define Type
+
+\begin{code}
+typeCon :: KindCon
+typeConName = mk_kind_name typeConKey SLIT("Type")
+typeCon = mkKindCon typeConName (superBoxity `FunTy` superKind)
+\end{code}
+
+Define (Type Boxed), (Type Unboxed), (Type AnyBox)
+
+\begin{code}
+boxedTypeKind, unboxedTypeKind, openTypeKind :: Kind
+boxedTypeKind = TyConApp typeCon [boxedKind]
+unboxedTypeKind = TyConApp typeCon [unboxedKind]
+openTypeKind = TyConApp typeCon [anyBoxKind]
+
+mkArrowKind :: Kind -> Kind -> Kind
+mkArrowKind k1 k2 = k1 `FunTy` k2
+
+mkArrowKinds :: [Kind] -> Kind -> Kind
+mkArrowKinds arg_kinds result_kind = foldr mkArrowKind result_kind arg_kinds
+\end{code}
+
+\begin{code}
+hasMoreBoxityInfo :: Kind -> Kind -> Bool
+hasMoreBoxityInfo k1 k2
+ | k2 == openTypeKind = ASSERT( is_type_kind k1) True
+ | otherwise = k1 == k2
+ where
+ -- Returns true for things of form (Type x)
+ is_type_kind k = case splitTyConApp_maybe k of
+ Just (tc,[_]) -> tc == typeCon
+ Nothing -> False
+\end{code}
+
+
+%************************************************************************
+%* *
+\subsection{Wired-in type constructors
+%* *
+%************************************************************************
+
+We define a few wired-in type constructors here to avoid module knots
+
+\begin{code}
+funTyConName = mkWiredInTyConName funTyConKey pREL_GHC SLIT("->") funTyCon
+funTyCon = mkFunTyCon funTyConName (mkArrowKinds [boxedTypeKind, boxedTypeKind] boxedTypeKind)
\end{code}
+
%************************************************************************
%* *
\subsection{Constructor-specific functions}
TyVarTy
~~~~~~~
\begin{code}
-mkTyVarTy :: GenTyVar flexi -> GenType flexi
+mkTyVarTy :: TyVar -> Type
mkTyVarTy = TyVarTy
-mkTyVarTys :: [GenTyVar flexi] -> [GenType flexi]
+mkTyVarTys :: [TyVar] -> [Type]
mkTyVarTys = map mkTyVarTy -- a common use of mkTyVarTy
-getTyVar :: String -> GenType flexi -> GenTyVar flexi
+getTyVar :: String -> Type -> TyVar
getTyVar msg (TyVarTy tv) = tv
-getTyVar msg (SynTy _ t) = getTyVar msg t
+getTyVar msg (NoteTy _ t) = getTyVar msg t
getTyVar msg other = panic ("getTyVar: " ++ msg)
-getTyVar_maybe :: GenType flexi -> Maybe (GenTyVar flexi)
+getTyVar_maybe :: Type -> Maybe TyVar
getTyVar_maybe (TyVarTy tv) = Just tv
-getTyVar_maybe (SynTy _ t) = getTyVar_maybe t
+getTyVar_maybe (NoteTy _ t) = getTyVar_maybe t
getTyVar_maybe other = Nothing
-isTyVarTy :: GenType flexi -> Bool
-isTyVarTy (TyVarTy tv) = True
-isTyVarTy (SynTy _ ty) = isTyVarTy ty
-isTyVarTy other = False
+isTyVarTy :: Type -> Bool
+isTyVarTy (TyVarTy tv) = True
+isTyVarTy (NoteTy _ ty) = isTyVarTy ty
+isTyVarTy other = False
\end{code}
\begin{code}
mkAppTy orig_ty1 orig_ty2 = mk_app orig_ty1
where
- mk_app (SynTy _ ty1) = mk_app ty1
+ mk_app (NoteTy _ ty1) = mk_app ty1
mk_app (TyConApp tc tys) = mkTyConApp tc (tys ++ [orig_ty2])
mk_app ty1 = AppTy orig_ty1 orig_ty2
-mkAppTys :: GenType flexi -> [GenType flexi] -> GenType flexi
+mkAppTys :: Type -> [Type] -> Type
mkAppTys orig_ty1 [] = orig_ty1
-- This check for an empty list of type arguments
-- avoids the needless of a type synonym constructor.
-- the Rational part.
mkAppTys orig_ty1 orig_tys2 = mk_app orig_ty1
where
- mk_app (SynTy _ ty1) = mk_app ty1
+ mk_app (NoteTy _ ty1) = mk_app ty1
mk_app (TyConApp tc tys) = mkTyConApp tc (tys ++ orig_tys2)
mk_app ty1 = foldl AppTy orig_ty1 orig_tys2
-splitAppTy :: GenType flexi -> (GenType flexi, GenType flexi)
-splitAppTy (FunTy ty1 ty2) = (TyConApp mkFunTyCon [ty1], ty2)
-splitAppTy (AppTy ty1 ty2) = (ty1, ty2)
-splitAppTy (SynTy _ ty) = splitAppTy ty
-splitAppTy (TyConApp tc tys) = split tys []
+splitAppTy_maybe :: Type -> Maybe (Type, Type)
+splitAppTy_maybe (FunTy ty1 ty2) = Just (TyConApp funTyCon [ty1], ty2)
+splitAppTy_maybe (AppTy ty1 ty2) = Just (ty1, ty2)
+splitAppTy_maybe (NoteTy _ ty) = splitAppTy_maybe ty
+splitAppTy_maybe (TyConApp tc []) = Nothing
+splitAppTy_maybe (TyConApp tc tys) = split tys []
where
- split [ty2] acc = (TyConApp tc (reverse acc), ty2)
+ split [ty2] acc = Just (TyConApp tc (reverse acc), ty2)
split (ty:tys) acc = split tys (ty:acc)
-splitAppTy other = panic "splitAppTy"
-splitAppTys :: GenType flexi -> (GenType flexi, [GenType flexi])
+splitAppTy_maybe other = Nothing
+
+splitAppTy :: Type -> (Type, Type)
+splitAppTy ty = case splitAppTy_maybe ty of
+ Just pr -> pr
+ Nothing -> panic "splitAppTy"
+
+splitAppTys :: Type -> (Type, [Type])
splitAppTys ty = split ty ty []
where
split orig_ty (AppTy ty arg) args = split ty ty (arg:args)
- split orig_ty (SynTy _ ty) args = split orig_ty ty args
+ split orig_ty (NoteTy _ ty) args = split orig_ty ty args
split orig_ty (FunTy ty1 ty2) args = ASSERT( null args )
- (TyConApp mkFunTyCon [], [ty1,ty2])
+ (TyConApp funTyCon [], [ty1,ty2])
split orig_ty (TyConApp tc tc_args) args = (TyConApp tc [], tc_args ++ args)
split orig_ty ty args = (orig_ty, args)
\end{code}
~~~~~
\begin{code}
-mkFunTy :: GenType flexi -> GenType flexi -> GenType flexi
+mkFunTy :: Type -> Type -> Type
mkFunTy arg res = FunTy arg res
-mkFunTys :: [GenType flexi] -> GenType flexi -> GenType flexi
+mkFunTys :: [Type] -> Type -> Type
mkFunTys tys ty = foldr FunTy ty tys
-splitFunTy_maybe :: GenType flexi -> Maybe (GenType flexi, GenType flexi)
+splitFunTy_maybe :: Type -> Maybe (Type, Type)
splitFunTy_maybe (FunTy arg res) = Just (arg, res)
-splitFunTy_maybe (SynTy _ ty) = splitFunTy_maybe ty
+splitFunTy_maybe (NoteTy _ ty) = splitFunTy_maybe ty
splitFunTy_maybe other = Nothing
-splitFunTys :: GenType flexi -> ([GenType flexi], GenType flexi)
+splitFunTys :: Type -> ([Type], Type)
splitFunTys ty = split [] ty ty
where
split args orig_ty (FunTy arg res) = split (arg:args) res res
- split args orig_ty (SynTy _ ty) = split args orig_ty ty
+ split args orig_ty (NoteTy _ ty) = split args orig_ty ty
split args orig_ty ty = (reverse args, orig_ty)
+
+zipFunTys :: Outputable a => [a] -> Type -> ([(a,Type)], Type)
+zipFunTys orig_xs orig_ty = split [] orig_xs orig_ty orig_ty
+ where
+ split acc [] nty ty = (reverse acc, nty)
+ split acc (x:xs) nty (FunTy arg res) = split ((x,arg):acc) xs res res
+ split acc xs nty (NoteTy _ ty) = split acc xs nty ty
+ split acc (x:xs) nty ty = pprPanic "zipFunTys" (ppr orig_xs <+> pprType orig_ty)
+
+funResultTy :: Type -> Type
+funResultTy (FunTy arg res) = res
+funResultTy (NoteTy _ ty) = funResultTy ty
+funResultTy ty = pprPanic "funResultTy" (pprType ty)
\end{code}
~~~~~~~~
\begin{code}
-mkTyConApp :: TyCon -> [GenType flexi] -> GenType flexi
+mkTyConApp :: TyCon -> [Type] -> Type
mkTyConApp tycon tys
| isFunTyCon tycon && length tys == 2
= case tys of
= ASSERT(not (isSynTyCon tycon))
TyConApp tycon tys
-mkTyConTy :: TyCon -> GenType flexi
+mkTyConTy :: TyCon -> Type
mkTyConTy tycon = ASSERT( not (isSynTyCon tycon) )
TyConApp tycon []
-- mean a distinct type, but all other type-constructor applications
-- including functions are returned as Just ..
-splitTyConApp_maybe :: GenType flexi -> Maybe (TyCon, [GenType flexi])
+splitTyConApp_maybe :: Type -> Maybe (TyCon, [Type])
splitTyConApp_maybe (TyConApp tc tys) = Just (tc, tys)
-splitTyConApp_maybe (FunTy arg res) = Just (mkFunTyCon, [arg,res])
-splitTyConApp_maybe (SynTy _ ty) = splitTyConApp_maybe ty
+splitTyConApp_maybe (FunTy arg res) = Just (funTyCon, [arg,res])
+splitTyConApp_maybe (NoteTy _ ty) = splitTyConApp_maybe ty
splitTyConApp_maybe other = Nothing
-- splitAlgTyConApp_maybe looks for
-- "Algebraic" => newtype, data type, or dictionary (not function types)
-- We return the constructors too.
-splitAlgTyConApp_maybe :: GenType flexi -> Maybe (TyCon, [GenType flexi], [Id])
+splitAlgTyConApp_maybe :: Type -> Maybe (TyCon, [Type], [DataCon])
splitAlgTyConApp_maybe (TyConApp tc tys)
| isAlgTyCon tc &&
- tyConArity tc == length tys = Just (tc, tys, tyConDataCons tc)
-splitAlgTyConApp_maybe (SynTy _ ty) = splitAlgTyConApp_maybe ty
-splitAlgTyConApp_maybe other = Nothing
+ tyConArity tc == length tys = Just (tc, tys, tyConDataCons tc)
+splitAlgTyConApp_maybe (NoteTy _ ty) = splitAlgTyConApp_maybe ty
+splitAlgTyConApp_maybe other = Nothing
-splitAlgTyConApp :: GenType flexi -> (TyCon, [GenType flexi], [Id])
+splitAlgTyConApp :: Type -> (TyCon, [Type], [DataCon])
-- Here the "algebraic" property is an *assertion*
splitAlgTyConApp (TyConApp tc tys) = ASSERT( isAlgTyCon tc && tyConArity tc == length tys )
(tc, tys, tyConDataCons tc)
-splitAlgTyConApp (SynTy _ ty) = splitAlgTyConApp ty
+splitAlgTyConApp (NoteTy _ ty) = splitAlgTyConApp ty
\end{code}
"Dictionary" types are just ordinary data types, but you can
tell from the type constructor whether it's a dictionary or not.
\begin{code}
-mkDictTy :: Class -> [GenType flexi] -> GenType flexi
+mkDictTy :: Class -> [Type] -> Type
mkDictTy clas tys = TyConApp (classTyCon clas) tys
-splitDictTy_maybe :: GenType flexi -> Maybe (Class, [GenType flexi])
+splitDictTy_maybe :: Type -> Maybe (Class, [Type])
splitDictTy_maybe (TyConApp tc tys)
| maybeToBool maybe_class
&& tyConArity tc == length tys = Just (clas, tys)
maybe_class = tyConClass_maybe tc
Just clas = maybe_class
-splitDictTy_maybe (SynTy _ ty) = splitDictTy_maybe ty
+splitDictTy_maybe (NoteTy _ ty) = splitDictTy_maybe ty
splitDictTy_maybe other = Nothing
-isDictTy :: GenType flexi -> Bool
+isDictTy :: Type -> Bool
-- This version is slightly more efficient than (maybeToBool . splitDictTy)
isDictTy (TyConApp tc tys)
| maybeToBool (tyConClass_maybe tc)
&& tyConArity tc == length tys
= True
-isDictTy (SynTy _ ty) = isDictTy ty
-isDictTy other = False
+isDictTy (NoteTy _ ty) = isDictTy ty
+isDictTy other = False
\end{code}
\begin{code}
mkSynTy syn_tycon tys
= ASSERT(isSynTyCon syn_tycon)
- SynTy (TyConApp syn_tycon tys)
- (instantiateTauTy (zipTyVarEnv tyvars tys) body)
+ NoteTy (SynNote (TyConApp syn_tycon tys))
+ (substTopTy (zipVarEnv tyvars tys) body)
where
(tyvars, body) = getSynTyConDefn syn_tycon
-isSynTy (SynTy _ _) = True
-isSynTy other = False
+isSynTy (NoteTy (SynNote _) _) = True
+isSynTy other = False
+
+deNoteType :: Type -> Type
+ -- Sorry for the cute name
+deNoteType ty@(TyVarTy tyvar) = ty
+deNoteType (TyConApp tycon tys) = TyConApp tycon (map deNoteType tys)
+deNoteType (NoteTy _ ty) = deNoteType ty
+deNoteType (AppTy fun arg) = AppTy (deNoteType fun) (deNoteType arg)
+deNoteType (FunTy fun arg) = FunTy (deNoteType fun) (deNoteType arg)
+deNoteType (ForAllTy tv ty) = ForAllTy tv (deNoteType ty)
\end{code}
Notes on type synonyms
\begin{code}
mkForAllTy = ForAllTy
-mkForAllTys :: [GenTyVar flexi] -> GenType flexi -> GenType flexi
+mkForAllTys :: [TyVar] -> Type -> Type
mkForAllTys tyvars ty = foldr ForAllTy ty tyvars
-splitForAllTy_maybe :: GenType flexi -> Maybe (GenTyVar flexi, GenType flexi)
-splitForAllTy_maybe (SynTy _ ty) = splitForAllTy_maybe ty
+splitForAllTy_maybe :: Type -> Maybe (TyVar, Type)
+splitForAllTy_maybe (NoteTy _ ty) = splitForAllTy_maybe ty
splitForAllTy_maybe (ForAllTy tyvar ty) = Just(tyvar, ty)
splitForAllTy_maybe _ = Nothing
-splitForAllTys :: GenType flexi -> ([GenTyVar flexi], GenType flexi)
+isForAllTy :: Type -> Bool
+isForAllTy (NoteTy _ ty) = isForAllTy ty
+isForAllTy (ForAllTy tyvar ty) = True
+isForAllTy _ = False
+
+splitForAllTys :: Type -> ([TyVar], Type)
splitForAllTys ty = split ty ty []
where
split orig_ty (ForAllTy tv ty) tvs = split ty ty (tv:tvs)
- split orig_ty (SynTy _ ty) tvs = split orig_ty ty tvs
+ split orig_ty (NoteTy _ ty) tvs = split orig_ty ty tvs
split orig_ty t tvs = (reverse tvs, orig_ty)
\end{code}
+@mkPiType@ makes a (->) type or a forall type, depending on whether
+it is given a type variable or a term variable.
\begin{code}
-applyTy :: GenType flexi -> GenType flexi -> GenType flexi
-applyTy (SynTy _ fun) arg = applyTy fun arg
-applyTy (ForAllTy tv ty) arg = instantiateTy (mkTyVarEnv [(tv,arg)]) ty
+mkPiType :: IdOrTyVar -> Type -> Type -- The more polymorphic version doesn't work...
+mkPiType v ty | isId v = mkFunTy (idType v) ty
+ | otherwise = ForAllTy v ty
+\end{code}
+
+\begin{code}
+applyTy :: Type -> Type -> Type
+applyTy (NoteTy _ fun) arg = applyTy fun arg
+applyTy (ForAllTy tv ty) arg = substTy (mkVarEnv [(tv,arg)]) ty
applyTy other arg = panic "applyTy"
-applyTys :: GenType flexi -> [GenType flexi] -> GenType flexi
+applyTys :: Type -> [Type] -> Type
applyTys fun_ty arg_tys
= go [] fun_ty arg_tys
where
- go env ty [] = instantiateTy (mkTyVarEnv env) ty
- go env (SynTy _ fun) args = go env fun args
+ go env ty [] = substTy (mkVarEnv env) ty
+ go env (NoteTy _ fun) args = go env fun args
go env (ForAllTy tv ty) (arg:args) = go ((tv,arg):env) ty args
go env other args = panic "applyTys"
\end{code}
@isTauTy@ tests for nested for-alls.
\begin{code}
-isTauTy :: GenType flexi -> Bool
+isTauTy :: Type -> Bool
isTauTy (TyVarTy v) = True
isTauTy (TyConApp _ tys) = all isTauTy tys
isTauTy (AppTy a b) = isTauTy a && isTauTy b
isTauTy (FunTy a b) = isTauTy a && isTauTy b
-isTauTy (SynTy _ ty) = isTauTy ty
+isTauTy (NoteTy _ ty) = isTauTy ty
isTauTy other = False
\end{code}
\begin{code}
-mkRhoTy :: [(Class, [GenType flexi])] -> GenType flexi -> GenType flexi
+mkRhoTy :: [(Class, [Type])] -> Type -> Type
mkRhoTy theta ty = foldr (\(c,t) r -> FunTy (mkDictTy c t) r) ty theta
-splitRhoTy :: GenType flexi -> ([(Class, [GenType flexi])], GenType flexi)
+splitRhoTy :: Type -> ([(Class, [Type])], Type)
splitRhoTy ty = split ty ty []
where
split orig_ty (FunTy arg res) ts = case splitDictTy_maybe arg of
Just pair -> split res res (pair:ts)
Nothing -> (reverse ts, orig_ty)
- split orig_ty (SynTy _ ty) ts = split orig_ty ty ts
+ split orig_ty (NoteTy _ ty) ts = split orig_ty ty ts
split orig_ty ty ts = (reverse ts, orig_ty)
\end{code}
\begin{code}
mkSigmaTy tyvars theta tau = mkForAllTys tyvars (mkRhoTy theta tau)
-splitSigmaTy :: GenType flexi -> ([GenTyVar flexi], [(Class, [GenType flexi])], GenType flexi)
+splitSigmaTy :: Type -> ([TyVar], [(Class, [Type])], Type)
splitSigmaTy ty =
(tyvars, theta, tau)
where
Finding the kind of a type
~~~~~~~~~~~~~~~~~~~~~~~~~~
\begin{code}
-typeKind :: GenType flexi -> Kind
-
-typeKind (TyVarTy tyvar) = tyVarKind tyvar
-typeKind (TyConApp tycon tys) = foldr (\_ k -> resultKind k) (tyConKind tycon) tys
-typeKind (SynTy _ ty) = typeKind ty
-typeKind (FunTy fun arg) = mkBoxedTypeKind
-typeKind (AppTy fun arg) = resultKind (typeKind fun)
-typeKind (ForAllTy _ _) = mkBoxedTypeKind
+typeKind :: Type -> Kind
+
+typeKind (TyVarTy tyvar) = tyVarKind tyvar
+typeKind (TyConApp tycon tys) = foldr (\_ k -> funResultTy k) (tyConKind tycon) tys
+typeKind (NoteTy _ ty) = typeKind ty
+typeKind (AppTy fun arg) = funResultTy (typeKind fun)
+typeKind (FunTy fun arg) = typeKindF arg
+typeKind (ForAllTy _ ty) = typeKindF ty -- We could make this a new kind polyTypeKind
+ -- to prevent a forall type unifying with a
+ -- boxed type variable, but I didn't think it
+ -- was worth it yet.
+
+-- The complication is that a *function* is boxed even if
+-- its *result* type is unboxed. Seems wierd.
+
+typeKindF :: Type -> Kind
+typeKindF (NoteTy _ ty) = typeKindF ty
+typeKindF (FunTy _ ty) = typeKindF ty
+typeKindF (ForAllTy _ ty) = typeKindF ty
+typeKindF other = fix_up (typeKind other)
+ where
+ fix_up (TyConApp kc _) | kc == typeCon = boxedTypeKind
+ -- Functions at the type level are always boxed
+ fix_up (NoteTy _ kind) = fix_up kind
+ fix_up kind = kind
\end{code}
Free variables of a type
~~~~~~~~~~~~~~~~~~~~~~~~
\begin{code}
-tyVarsOfType :: GenType flexi -> GenTyVarSet flexi
+tyVarsOfType :: Type -> TyVarSet
-tyVarsOfType (TyVarTy tv) = unitTyVarSet tv
+tyVarsOfType (TyVarTy tv) = unitVarSet tv
tyVarsOfType (TyConApp tycon tys) = tyVarsOfTypes tys
-tyVarsOfType (SynTy ty1 ty2) = tyVarsOfType ty1
-tyVarsOfType (FunTy arg res) = tyVarsOfType arg `unionTyVarSets` tyVarsOfType res
-tyVarsOfType (AppTy fun arg) = tyVarsOfType fun `unionTyVarSets` tyVarsOfType arg
-tyVarsOfType (ForAllTy tyvar ty) = tyVarsOfType ty `minusTyVarSet` unitTyVarSet tyvar
+tyVarsOfType (NoteTy (FTVNote tvs) ty2) = tvs
+tyVarsOfType (NoteTy (SynNote ty1) ty2) = tyVarsOfType ty1
+tyVarsOfType (FunTy arg res) = tyVarsOfType arg `unionVarSet` tyVarsOfType res
+tyVarsOfType (AppTy fun arg) = tyVarsOfType fun `unionVarSet` tyVarsOfType arg
+tyVarsOfType (ForAllTy tyvar ty) = tyVarsOfType ty `minusVarSet` unitVarSet tyvar
+
+tyVarsOfTypes :: [Type] -> TyVarSet
+tyVarsOfTypes tys = foldr (unionVarSet.tyVarsOfType) emptyVarSet tys
-tyVarsOfTypes :: [GenType flexi] -> GenTyVarSet flexi
-tyVarsOfTypes tys = foldr (unionTyVarSets.tyVarsOfType) emptyTyVarSet tys
+-- Add a Note with the free tyvars to the top of the type
+addFreeTyVars :: Type -> Type
+addFreeTyVars ty@(NoteTy (FTVNote _) _) = ty
+addFreeTyVars ty = NoteTy (FTVNote (tyVarsOfType ty)) ty
-- Find the free names of a type, including the type constructors and classes it mentions
-namesOfType :: GenType flexi -> NameSet
+namesOfType :: Type -> NameSet
namesOfType (TyVarTy tv) = unitNameSet (getName tv)
namesOfType (TyConApp tycon tys) = unitNameSet (getName tycon) `unionNameSets`
namesOfTypes tys
-namesOfType (SynTy ty1 ty2) = namesOfType ty1
+namesOfType (NoteTy (SynNote ty1) ty2) = namesOfType ty1
+namesOfType (NoteTy other_note ty2) = namesOfType ty2
namesOfType (FunTy arg res) = namesOfType arg `unionNameSets` namesOfType res
namesOfType (AppTy fun arg) = namesOfType fun `unionNameSets` namesOfType arg
namesOfType (ForAllTy tyvar ty) = namesOfType ty `minusNameSet` unitNameSet (getName tyvar)
%* *
%************************************************************************
-\begin{code}
-instantiateTy :: TyVarEnv (GenType flexi) -> GenType flexi -> GenType flexi
-instantiateTauTy :: TyVarEnv (GenType flexi2) -> GenType flexi1 -> GenType flexi2
-
-
--- instantiateTy applies a type environment to a type.
--- It can handle shadowing; for example:
--- f = /\ t1 t2 -> \ d ->
--- letrec f' = /\ t1 -> \x -> ...(f' t1 x')...
--- in f' t1
--- Here, when we clone t1 to t1', say, we'll come across shadowing
--- when applying the clone environment to the type of f'.
---
--- As a sanity check, we should also check that name capture
--- doesn't occur, but that means keeping track of the free variables of the
--- range of the TyVarEnv, which I don't do just yet.
-
-instantiateTy tenv ty
- | isEmptyTyVarEnv tenv
- = ty
+@substTy@ applies a substitution to a type. It deals correctly with name capture.
- | otherwise
- = go tenv ty
+\begin{code}
+substTy :: TyVarSubst -> Type -> Type
+substTy tenv ty
+ | isEmptyVarEnv tenv = ty
+ | otherwise = subst_ty tenv tset ty
where
- go tenv ty@(TyVarTy tv) = case (lookupTyVarEnv tenv tv) of
- Nothing -> ty
- Just ty -> ty
- go tenv (TyConApp tc tys) = TyConApp tc (map (go tenv) tys)
- go tenv (SynTy ty1 ty2) = SynTy (go tenv ty1) (go tenv ty2)
- go tenv (FunTy arg res) = FunTy (go tenv arg) (go tenv res)
- go tenv (AppTy fun arg) = mkAppTy (go tenv fun) (go tenv arg)
- go tenv (ForAllTy tv ty) = ForAllTy tv (go tenv' ty)
- where
- tenv' = case lookupTyVarEnv tenv tv of
- Nothing -> tenv
- Just _ -> delFromTyVarEnv tenv tv
+ tset = foldVarEnv (unionVarSet . tyVarsOfType) emptyVarSet tenv
+ -- If ty doesn't have any for-alls, then this thunk
+ -- will never be evaluated
+
+substTheta :: TyVarSubst -> ThetaType -> ThetaType
+substTheta tenv theta
+ | isEmptyVarEnv tenv = theta
+ | otherwise = [(clas, map (subst_ty tenv tset) tys) | (clas, tys) <- theta]
+ where
+ tset = foldVarEnv (unionVarSet . tyVarsOfType) emptyVarSet tenv
+ -- If ty doesn't have any for-alls, then this thunk
+ -- will never be evaluated
+
+substTopTy :: TyVarSubst -> Type -> Type
+substTopTy = substTy -- Called when doing top-level substitutions.
+ -- Here we expect that the free vars of the range of the
+ -- substitution will be empty; but during typechecking I'm
+ -- a bit dubious about that (mutable tyvars bouund to Int, say)
+ -- So I've left it as substTy for the moment. SLPJ Nov 98
+substTopTheta = substTheta
+\end{code}
--- instantiateTauTy works only (a) on types with no ForAlls,
--- and when (b) all the type variables are being instantiated
--- In return it is more polymorphic than instantiateTy
+@fullSubstTy@ is like @substTy@ except that it needs to be given a set
+of in-scope type variables. In exchange it's a bit more efficient, at least
+if you happen to have that set lying around.
-instantiateTauTy tenv ty = go ty
+\begin{code}
+fullSubstTy :: TyVarSubst -- Substitution to apply
+ -> TyVarSet -- Superset of the free tyvars of
+ -- the range of the tyvar env
+ -> Type -> Type
+-- ASSUMPTION: The substitution is idempotent.
+-- Equivalently: No tyvar is both in scope, and in the domain of the substitution.
+fullSubstTy tenv tset ty | isEmptyVarEnv tenv = ty
+ | otherwise = subst_ty tenv tset ty
+
+-- subst_ty does the business
+subst_ty tenv tset ty
+ = go ty
+ where
+ go (TyConApp tc tys) = TyConApp tc (map go tys)
+ go (NoteTy (SynNote ty1) ty2) = NoteTy (SynNote (go ty1)) (go ty2)
+ go (NoteTy (FTVNote _) ty2) = go ty2 -- Discard the free tyvar note
+ go (FunTy arg res) = FunTy (go arg) (go res)
+ go (AppTy fun arg) = mkAppTy (go fun) (go arg)
+ go ty@(TyVarTy tv) = case (lookupVarEnv tenv tv) of
+ Nothing -> ty
+ Just ty' -> ty'
+ go (ForAllTy tv ty) = case substTyVar tenv tset tv of
+ (tenv', tset', tv') -> ForAllTy tv' (subst_ty tenv' tset' ty)
+
+substTyVar :: TyVarSubst -> TyVarSet -> TyVar
+ -> (TyVarSubst, TyVarSet, TyVar)
+
+substTyVar tenv tset tv
+ | not (tv `elemVarSet` tset) -- No need to clone
+ -- But must delete from substitution
+ = (tenv `delVarEnv` tv, tset `extendVarSet` tv, tv)
+
+ | otherwise -- The forall's variable is in scope so
+ -- we'd better rename it away from the in-scope variables
+ -- Extending the substitution to do this renaming also
+ -- has the (correct) effect of discarding any existing
+ -- substitution for that variable
+ = (extendVarEnv tenv tv (TyVarTy tv'), tset `extendVarSet` tv', tv')
where
- go ty@(TyVarTy tv) = case (lookupTyVarEnv tenv tv) of
- Just ty -> ty -- Must succeed
- go (TyConApp tc tys) = TyConApp tc (map go tys)
- go (SynTy ty1 ty2) = SynTy (go ty1) (go ty2)
- go (FunTy arg res) = FunTy (go arg) (go res)
- go (AppTy fun arg) = mkAppTy (go fun) (go arg)
- go (ForAllTy tv ty) = panic "instantiateTauTy"
-
-
-instantiateThetaTy :: TyVarEnv Type -> ThetaType -> ThetaType
-instantiateThetaTy tenv theta
- = [(clas, map (instantiateTauTy tenv) tys) | (clas, tys) <- theta]
+ tv' = uniqAway tset tv
\end{code}
%************************************************************************
%* *
-\subsection{Boxedness and pointedness}
+\subsection{TidyType}
%* *
%************************************************************************
-A type is
- *unboxed* iff its representation is other than a pointer
- Unboxed types cannot instantiate a type variable
- Unboxed types are always unpointed.
+tidyTy tidies up a type for printing in an error message, or in
+an interface file.
- *unpointed* iff it can't be a thunk, and cannot have value bottom
- An unpointed type may or may not be unboxed.
- (E.g. Array# is unpointed, but boxed.)
- An unpointed type *can* instantiate a type variable,
- provided it is boxed.
+It doesn't change the uniques at all, just the print names.
- *primitive* iff it is a built-in type that can't be expressed
- in Haskell
+\begin{code}
+tidyTyVar :: TidyEnv -> TyVar -> (TidyEnv, TyVar)
+tidyTyVar env@(tidy_env, subst) tyvar
+ = case lookupVarEnv subst tyvar of
-Currently, all primitive types are unpointed, but that's not necessarily
-the case. (E.g. Int could be primitive.)
+ Just tyvar' -> -- Already substituted
+ (env, tyvar')
+
+ Nothing -> -- Make a new nice name for it
+
+ case tidyOccName tidy_env (getOccName tyvar) of
+ (tidy', occ') -> -- New occname reqd
+ ((tidy', subst'), tyvar')
+ where
+ subst' = extendVarEnv subst tyvar tyvar'
+ tyvar' = setVarOcc tyvar occ'
+
+tidyTyVars env tyvars = mapAccumL tidyTyVar env tyvars
+
+tidyType :: TidyEnv -> Type -> Type
+tidyType env@(tidy_env, subst) ty
+ = go ty
+ where
+ go (TyVarTy tv) = case lookupVarEnv subst tv of
+ Nothing -> TyVarTy tv
+ Just tv' -> TyVarTy tv'
+ go (TyConApp tycon tys) = TyConApp tycon (map go tys)
+ go (NoteTy note ty) = NoteTy (go_note note) (go ty)
+ go (AppTy fun arg) = AppTy (go fun) (go arg)
+ go (FunTy fun arg) = FunTy (go fun) (go arg)
+ go (ForAllTy tv ty) = ForAllTy tv' (tidyType env' ty)
+ where
+ (env', tv') = tidyTyVar env tv
+
+ go_note (SynNote ty) = SynNote (go ty)
+ go_note note@(FTVNote ftvs) = note -- No need to tidy the free tyvars
+
+tidyTypes env tys = map (tidyType env) tys
+\end{code}
+
+
+@tidyOpenType@ grabs the free type varibles, tidies them
+and then uses @tidyType@ to work over the type itself
\begin{code}
-isUnboxedType :: Type -> Bool
-isUnboxedType ty = case typePrimRep ty of
- PtrRep -> False
- other -> True
-
--- Danger! Currently the unpointed types are precisely
--- the primitive ones, but that might not always be the case
-isUnpointedType :: Type -> Bool
-isUnpointedType ty = case splitTyConApp_maybe ty of
- Just (tc, ty_args) -> isPrimTyCon tc
- other -> False
+tidyOpenType :: TidyEnv -> Type -> (TidyEnv, Type)
+tidyOpenType env ty
+ = (env', tidyType env' ty)
+ where
+ env' = foldl go env (varSetElems (tyVarsOfType ty))
+ go env tyvar = fst (tidyTyVar env tyvar)
-typePrimRep :: Type -> PrimRep
-typePrimRep ty = case splitTyConApp_maybe ty of
- Just (tc, ty_args) -> tyConPrimRep tc
- other -> PtrRep
+tidyOpenTypes :: TidyEnv -> [Type] -> (TidyEnv, [Type])
+tidyOpenTypes env tys = mapAccumL tidyOpenType env tys
+
+tidyTopType :: Type -> Type
+tidyTopType ty = tidyType emptyTidyEnv ty
\end{code}
%************************************************************************
%* *
-\subsection{Matching on types}
+\subsection{Boxedness and liftedness}
%* *
%************************************************************************
-Matching is a {\em unidirectional} process, matching a type against a
-template (which is just a type with type variables in it). The
-matcher assumes that there are no repeated type variables in the
-template, so that it simply returns a mapping of type variables to
-types. It also fails on nested foralls.
+\begin{code}
+isUnboxedType :: Type -> Bool
+isUnboxedType ty = not (isFollowableRep (typePrimRep ty))
-@matchTys@ matches corresponding elements of a list of templates and
-types.
+isUnLiftedType :: Type -> Bool
+isUnLiftedType ty = case splitTyConApp_maybe ty of
+ Just (tc, ty_args) -> isUnLiftedTyCon tc
+ other -> False
-\begin{code}
-matchTy :: GenType flexi1 -- Template
- -> GenType flexi2 -- Proposed instance of template
- -> Maybe (TyVarEnv (GenType flexi2)) -- Matching substitution
-
-
-matchTys :: [GenType flexi1] -- Templates
- -> [GenType flexi2] -- Proposed instance of template
- -> Maybe (TyVarEnv (GenType flexi2), -- Matching substitution
- [GenType flexi2]) -- Left over instance types
-
-matchTy ty1 ty2 = match ty1 ty2 (\s -> Just s) emptyTyVarEnv
-matchTys tys1 tys2 = match_list tys1 tys2 (\pr -> Just pr) emptyTyVarEnv
-\end{code}
+isUnboxedTupleType :: Type -> Bool
+isUnboxedTupleType ty = case splitTyConApp_maybe ty of
+ Just (tc, ty_args) -> isUnboxedTupleTyCon tc
+ other -> False
-@match@ is the main function.
+-- Should only be applied to *types*; hence the assert
+isAlgType :: Type -> Bool
+isAlgType ty = case splitTyConApp_maybe ty of
+ Just (tc, ty_args) -> ASSERT( length ty_args == tyConArity tc )
+ isAlgTyCon tc
+ other -> False
-\begin{code}
-match :: GenType flexi1 -> GenType flexi2 -- Current match pair
- -> (TyVarEnv (GenType flexi2) -> Maybe result) -- Continuation
- -> TyVarEnv (GenType flexi2) -- Current substitution
- -> Maybe result
-
--- When matching against a type variable, see if the variable
--- has already been bound. If so, check that what it's bound to
--- is the same as ty; if not, bind it and carry on.
-
-match (TyVarTy v) ty k = \s -> case lookupTyVarEnv s v of
- Nothing -> k (addToTyVarEnv s v ty)
- Just ty' | ty' == ty -> k s -- Succeeds
- | otherwise -> Nothing -- Fails
-
-match (FunTy arg1 res1) (FunTy arg2 res2) k = match arg1 arg2 (match res1 res2 k)
-match (AppTy fun1 arg1) (AppTy fun2 arg2) k = match fun1 fun2 (match arg1 arg2 k)
-match (TyConApp tc1 tys1) (TyConApp tc2 tys2) k | tc1 == tc2
- = match_list tys1 tys2 ( \(s,tys2') ->
- if null tys2' then
- k s -- Succeed
- else
- Nothing -- Fail
- )
-
- -- With type synonyms, we have to be careful for the exact
- -- same reasons as in the unifier. Please see the
- -- considerable commentary there before changing anything
- -- here! (WDP 95/05)
-match (SynTy _ ty1) ty2 k = match ty1 ty2 k
-match ty1 (SynTy _ ty2) k = match ty1 ty2 k
-
--- Catch-all fails
-match _ _ _ = \s -> Nothing
-
-match_list [] tys2 k = \s -> k (s, tys2)
-match_list (ty1:tys1) [] k = panic "match_list"
-match_list (ty1:tys1) (ty2:tys2) k = match ty1 ty2 (match_list tys1 tys2 k)
+-- Should only be applied to *types*; hence the assert
+isDataType :: Type -> Bool
+isDataType ty = case splitTyConApp_maybe ty of
+ Just (tc, ty_args) -> ASSERT( length ty_args == tyConArity tc )
+ isDataTyCon tc
+ other -> False
+
+typePrimRep :: Type -> PrimRep
+typePrimRep ty = case splitTyConApp_maybe ty of
+ Just (tc, ty_args) -> tyConPrimRep tc
+ other -> PtrRep
\end{code}
%************************************************************************
there are embedded for-alls.
\begin{code}
-instance Eq (GenType flexi) where
+instance Eq Type where
ty1 == ty2 = case ty1 `cmpTy` ty2 of { EQ -> True; other -> False }
-instance Ord (GenType flexi) where
+instance Ord Type where
compare ty1 ty2 = cmpTy ty1 ty2
-cmpTy :: GenType flexi -> GenType flexi -> Ordering
+cmpTy :: Type -> Type -> Ordering
cmpTy ty1 ty2
- = cmp emptyTyVarEnv ty1 ty2
+ = cmp emptyVarEnv ty1 ty2
where
-- The "env" maps type variables in ty1 to type variables in ty2
-- So when comparing for-alls.. (forall tv1 . t1) (forall tv2 . t2)
-- we in effect substitute tv2 for tv1 in t1 before continuing
- lookup env tv1 = case lookupTyVarEnv env tv1 of
+ lookup env tv1 = case lookupVarEnv env tv1 of
Just tv2 -> tv2
Nothing -> tv1
- -- Get rid of SynTy
- cmp env (SynTy _ ty1) ty2 = cmp env ty1 ty2
- cmp env ty1 (SynTy _ ty2) = cmp env ty1 ty2
+ -- Get rid of NoteTy
+ cmp env (NoteTy _ ty1) ty2 = cmp env ty1 ty2
+ cmp env ty1 (NoteTy _ ty2) = cmp env ty1 ty2
-- Deal with equal constructors
cmp env (TyVarTy tv1) (TyVarTy tv2) = lookup env tv1 `compare` tv2
cmp env (AppTy f1 a1) (AppTy f2 a2) = cmp env f1 f2 `thenCmp` cmp env a1 a2
cmp env (FunTy f1 a1) (FunTy f2 a2) = cmp env f1 f2 `thenCmp` cmp env a1 a2
cmp env (TyConApp tc1 tys1) (TyConApp tc2 tys2) = (tc1 `compare` tc2) `thenCmp` (cmps env tys1 tys2)
- cmp env (ForAllTy tv1 t1) (ForAllTy tv2 t2) = cmp (addToTyVarEnv env tv1 tv2) t1 t2
+ cmp env (ForAllTy tv1 t1) (ForAllTy tv2 t2) = cmp (extendVarEnv env tv1 tv2) t1 t2
-- Deal with the rest: TyVarTy < AppTy < FunTy < TyConApp < ForAllTy
cmp env (AppTy _ _) (TyVarTy _) = GT
\end{code}
-
-%************************************************************************
-%* *
-\subsection{Grime}
-%* *
-%************************************************************************
-
-
-
-\begin{code}
-showTypeCategory :: Type -> Char
- {-
- {C,I,F,D} char, int, float, double
- T tuple
- S other single-constructor type
- {c,i,f,d} unboxed ditto
- t *unpacked* tuple
- s *unpacked" single-cons...
-
- v void#
- a primitive array
-
- E enumeration type
- + dictionary, unless it's a ...
- L List
- > function
- M other (multi-constructor) data-con type
- . other type
- - reserved for others to mark as "uninteresting"
- -}
-showTypeCategory ty
- = if isDictTy ty
- then '+'
- else
- case splitTyConApp_maybe ty of
- Nothing -> if maybeToBool (splitFunTy_maybe ty)
- then '>'
- else '.'
-
- Just (tycon, _) ->
- let utc = uniqueOf tycon in
- if utc == charDataConKey then 'C'
- else if utc == intDataConKey then 'I'
- else if utc == floatDataConKey then 'F'
- else if utc == doubleDataConKey then 'D'
- else if utc == integerDataConKey then 'J'
- else if utc == charPrimTyConKey then 'c'
- else if (utc == intPrimTyConKey || utc == wordPrimTyConKey
- || utc == addrPrimTyConKey) then 'i'
- else if utc == floatPrimTyConKey then 'f'
- else if utc == doublePrimTyConKey then 'd'
- else if isPrimTyCon tycon {- array, we hope -} then 'A'
- else if isEnumerationTyCon tycon then 'E'
- else if isTupleTyCon tycon then 'T'
- else if maybeToBool (maybeTyConSingleCon tycon) then 'S'
- else if utc == listTyConKey then 'L'
- else 'M' -- oh, well...
-\end{code}