Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/16e7a0326b17584af88c450e3625f1e69d083c58 >--------------------------------------------------------------- commit 16e7a0326b17584af88c450e3625f1e69d083c58 Author: Simon Peyton Jones <simo...@microsoft.com> Date: Fri Feb 17 14:00:42 2012 +0000 Fix a missing defaultKind that resulted in lingering ArgKinds >--------------------------------------------------------------- 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 cce80af..d99bd81 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 } _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
