From: simonpj Date: Fri, 10 Oct 2003 18:26:24 +0000 (+0000) Subject: [project @ 2003-10-10 18:26:24 by simonpj] X-Git-Tag: Approx_11550_changesets_converted~372 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9db2b548fd3e5fdc3c9e344cdb58b172f0e0d398;p=ghc-hetmet.git [project @ 2003-10-10 18:26:24 by simonpj] Use tcIsTyVarTy --- diff --git a/ghc/compiler/typecheck/TcMType.lhs b/ghc/compiler/typecheck/TcMType.lhs index df9bd11..7c75d91 100644 --- a/ghc/compiler/typecheck/TcMType.lhs +++ b/ghc/compiler/typecheck/TcMType.lhs @@ -51,8 +51,8 @@ import TcType ( TcType, TcThetaType, TcTauType, TcPredType, tcEqType, tcCmpPred, isClassPred, tcSplitPhiTy, tcSplitPredTy_maybe, tcSplitAppTy_maybe, tcSplitTyConApp_maybe, tcSplitForAllTys, - tcIsTyVarTy, tcSplitSigmaTy, - isUnLiftedType, isIPPred, isTyVarTy, + tcIsTyVarTy, tcSplitSigmaTy, tcIsTyVarTy, + isUnLiftedType, isIPPred, mkAppTy, mkTyVarTy, mkTyVarTys, tyVarsOfPred, getClassPredTys_maybe, @@ -816,7 +816,7 @@ check_class_pred_tys dflags ctxt tys = case ctxt of InstHeadCtxt -> True -- We check for instance-head -- formation in checkValidInstHead - InstThetaCtxt -> undecidable_ok || all isTyVarTy tys + InstThetaCtxt -> undecidable_ok || all tcIsTyVarTy tys other -> gla_exts || all tyvar_head tys where undecidable_ok = dopt Opt_AllowUndecidableInstances dflags