git.haskell.org
/
ghc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fedb6a9
)
Remove bogus isCoercionKind function and its sole use
author
Max Bolingbroke
<batterseapower@hotmail.com>
Sun, 14 Aug 2011 07:06:17 +0000
(08:06 +0100)
committer
Max Bolingbroke
<batterseapower@hotmail.com>
Tue, 6 Sep 2011 16:16:55 +0000
(17:16 +0100)
compiler/iface/TcIface.lhs
patch
|
blob
|
history
compiler/prelude/TysPrim.lhs
patch
|
blob
|
history
compiler/types/Coercion.lhs
patch
|
blob
|
history
compiler/types/Kind.lhs
patch
|
blob
|
history
compiler/types/TypeRep.lhs
patch
|
blob
|
history
diff --git
a/compiler/iface/TcIface.lhs
b/compiler/iface/TcIface.lhs
index
d0ce1b7
..
87fac02
100644
(file)
--- a/
compiler/iface/TcIface.lhs
+++ b/
compiler/iface/TcIface.lhs
@@
-1335,10
+1335,7
@@
bindIfaceTyVars bndrs thing_inside
mk_iface_tyvar :: Name -> IfaceKind -> IfL TyVar
mk_iface_tyvar name ifKind
= do { kind <- tcIfaceType ifKind
mk_iface_tyvar :: Name -> IfaceKind -> IfL TyVar
mk_iface_tyvar name ifKind
= do { kind <- tcIfaceType ifKind
- ; if isCoercionKind kind then
- return (Var.mkCoVar name kind)
- else
- return (Var.mkTyVar name kind) }
+ ; return (Var.mkTyVar name kind) }
bindIfaceTyVars_AT :: [IfaceTvBndr] -> ([TyVar] -> IfL a) -> IfL a
-- Used for type variable in nested associated data/type declarations
bindIfaceTyVars_AT :: [IfaceTvBndr] -> ([TyVar] -> IfL a) -> IfL a
-- Used for type variable in nested associated data/type declarations
diff --git
a/compiler/prelude/TysPrim.lhs
b/compiler/prelude/TysPrim.lhs
index
d0495d7
..
b130c21
100644
(file)
--- a/
compiler/prelude/TysPrim.lhs
+++ b/
compiler/prelude/TysPrim.lhs
@@
-26,7
+26,7
@@
module TysPrim(
-- Kinds
liftedTypeKind, unliftedTypeKind, openTypeKind,
argTypeKind, ubxTupleKind,
-- Kinds
liftedTypeKind, unliftedTypeKind, openTypeKind,
argTypeKind, ubxTupleKind,
- mkArrowKind, mkArrowKinds,
isCoercionKind,
+ mkArrowKind, mkArrowKinds,
funTyCon, funTyConName,
primTyCons,
funTyCon, funTyConName,
primTyCons,
diff --git
a/compiler/types/Coercion.lhs
b/compiler/types/Coercion.lhs
index
621168f
..
d9f48a3
100644
(file)
--- a/
compiler/types/Coercion.lhs
+++ b/
compiler/types/Coercion.lhs
@@
-18,7
+18,7
@@
module Coercion (
-- ** Predicates on Kinds
isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
isUbxTupleKind, isArgTypeKind, isKind, isTySuperKind,
-- ** Predicates on Kinds
isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
isUbxTupleKind, isArgTypeKind, isKind, isTySuperKind,
- isSuperKind,
isCoercionKind,
+ isSuperKind,
mkArrowKind, mkArrowKinds,
isSubArgTypeKind, isSubOpenTypeKind, isSubKind, defaultKind, eqKind,
mkArrowKind, mkArrowKinds,
isSubArgTypeKind, isSubOpenTypeKind, isSubKind, defaultKind, eqKind,
diff --git
a/compiler/types/Kind.lhs
b/compiler/types/Kind.lhs
index
0594f7f
..
777ed43
100644
(file)
--- a/
compiler/types/Kind.lhs
+++ b/
compiler/types/Kind.lhs
@@
-28,7
+28,7
@@
module Kind (
-- ** Predicates on Kinds
isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
isUbxTupleKind, isArgTypeKind, isKind, isTySuperKind,
-- ** Predicates on Kinds
isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
isUbxTupleKind, isArgTypeKind, isKind, isTySuperKind,
- isSuperKind,
isCoercionKind,
+ isSuperKind,
isLiftedTypeKindCon,
isSubArgTypeKind, isSubOpenTypeKind, isSubKind, defaultKind,
isLiftedTypeKindCon,
isSubArgTypeKind, isSubOpenTypeKind, isSubKind, defaultKind,
diff --git
a/compiler/types/TypeRep.lhs
b/compiler/types/TypeRep.lhs
index
d656620
..
6a0b87c
100644
(file)
--- a/
compiler/types/TypeRep.lhs
+++ b/
compiler/types/TypeRep.lhs
@@
-18,7
+18,7
@@
module TypeRep (
-- Functions over types
mkTyConApp, mkTyConTy, mkTyVarTy, mkTyVarTys,
-- Functions over types
mkTyConApp, mkTyConTy, mkTyVarTy, mkTyVarTys,
- isLiftedTypeKind,
isCoercionKind,
+ isLiftedTypeKind,
-- Pretty-printing
pprType, pprParendType, pprTypeApp,
-- Pretty-printing
pprType, pprParendType, pprTypeApp,
@@
-266,13
+266,6
@@
isLiftedTypeKind :: Kind -> Bool
-- This function is here because it's used in the pretty printer
isLiftedTypeKind (TyConApp tc []) = tc `hasKey` liftedTypeKindTyConKey
isLiftedTypeKind _ = False
-- This function is here because it's used in the pretty printer
isLiftedTypeKind (TyConApp tc []) = tc `hasKey` liftedTypeKindTyConKey
isLiftedTypeKind _ = False
-
-isCoercionKind :: Kind -> Bool
--- All coercions are of form (ty1 ~ ty2)
--- This function is here rather than in Coercion, because it
--- is used in a knot-tied way to enforce invariants in Var
-isCoercionKind (PredTy (EqPred {})) = True
-isCoercionKind _ = False
\end{code}
\end{code}