diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-02-17 14:00:42 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-02-17 14:00:42 +0000 |
| commit | 16e7a0326b17584af88c450e3625f1e69d083c58 (patch) | |
| tree | 3c8df0ecbe6698b468db1a3227d1a1e71d2e33e8 | |
| parent | 0a5e4c6456af579ea586d46f2c532d40aa9a4f06 (diff) | |
| download | haskell-16e7a0326b17584af88c450e3625f1e69d083c58.tar.gz | |
Fix a missing defaultKind that resulted in lingering ArgKinds
| -rw-r--r-- | compiler/typecheck/TcHsSyn.lhs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/typecheck/TcHsSyn.lhs b/compiler/typecheck/TcHsSyn.lhs index cce80af5d8..d99bd81bfc 100644 --- a/compiler/typecheck/TcHsSyn.lhs +++ b/compiler/typecheck/TcHsSyn.lhs @@ -46,7 +46,6 @@ import TcEvidence import TysPrim import TysWiredIn import Type -import Kind import DataCon import Name import NameSet @@ -1290,7 +1289,7 @@ zonkTvCollecting :: TcRef TyVarSet -> UnboundTyVarZonker -- Works on both types and kinds zonkTvCollecting unbound_tv_set tv = do { poly_kinds <- xoptM Opt_PolyKinds - ; if isKiVar tv && not poly_kinds then defaultKindVarToStar tv + ; if isKindVar tv && not poly_kinds then defaultKindVarToStar tv else do { tv' <- zonkQuantifiedTyVar tv ; tv_set <- readMutVar unbound_tv_set @@ -1302,10 +1301,10 @@ zonkTypeZapping :: UnboundTyVarZonker -- It zaps unbound type variables to (), or some other arbitrary type -- Works on both types and kinds zonkTypeZapping tv - = do { let ty = if isKiVar tv + = do { let ty = if isKindVar tv -- ty is actually a kind, zonk to AnyK then anyKind - else anyTypeOfKind (tyVarKind tv) + else anyTypeOfKind (defaultKind (tyVarKind tv)) ; writeMetaTyVar tv ty ; return ty } |