diff options
Diffstat (limited to 'compiler/typecheck')
| -rw-r--r-- | compiler/typecheck/TcErrors.lhs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcHsSyn.lhs | 2 | ||||
| -rw-r--r-- | compiler/typecheck/TcMType.lhs | 10 | ||||
| -rw-r--r-- | compiler/typecheck/TcRnTypes.lhs | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/compiler/typecheck/TcErrors.lhs b/compiler/typecheck/TcErrors.lhs index b199053ac2..28ec43a42e 100644 --- a/compiler/typecheck/TcErrors.lhs +++ b/compiler/typecheck/TcErrors.lhs @@ -737,7 +737,7 @@ monomorphism_fix dflags getSkolemInfo :: [Implication] -> TcTyVar -> SkolemInfo getSkolemInfo [] tv - = WARN( True, ptext (sLit "No skolem info:") <+> ppr tv ) + = WARN( dflags, True, ptext (sLit "No skolem info:") <+> ppr tv ) UnkSkol getSkolemInfo (implic:implics) tv | tv `elemVarSet` ic_skols implic = ctLocOrigin (ic_loc implic) diff --git a/compiler/typecheck/TcHsSyn.lhs b/compiler/typecheck/TcHsSyn.lhs index 12b50acff0..1c6dc9d625 100644 --- a/compiler/typecheck/TcHsSyn.lhs +++ b/compiler/typecheck/TcHsSyn.lhs @@ -528,7 +528,7 @@ zonkExpr env (HsBracketOut body bs) zonk_b (n,e) = zonkLExpr env e `thenM` \ e' -> returnM (n,e') -zonkExpr _ (HsSpliceE s) = WARN( True, ppr s ) -- Should not happen +zonkExpr _ (HsSpliceE s) = WARN( dflags, True, ppr s ) -- Should not happen returnM (HsSpliceE s) zonkExpr env (OpApp e1 op fixity e2) diff --git a/compiler/typecheck/TcMType.lhs b/compiler/typecheck/TcMType.lhs index 2c01d2300a..8384fd04d1 100644 --- a/compiler/typecheck/TcMType.lhs +++ b/compiler/typecheck/TcMType.lhs @@ -325,14 +325,14 @@ writeMetaTyVar tyvar ty -- Everything from here on only happens if DEBUG is on | not (isTcTyVar tyvar) - = WARN( True, text "Writing to non-tc tyvar" <+> ppr tyvar ) + = WARN( dflags, True, text "Writing to non-tc tyvar" <+> ppr tyvar ) return () | MetaTv _ ref <- tcTyVarDetails tyvar = writeMetaTyVarRef tyvar ref ty | otherwise - = WARN( True, text "Writing to non-meta tyvar" <+> ppr tyvar ) + = WARN( dflags, True, text "Writing to non-meta tyvar" <+> ppr tyvar ) return () -------------------- @@ -347,7 +347,7 @@ writeMetaTyVarRef tyvar ref ty -- Everything from here on only happens if DEBUG is on | not (isPredTy tv_kind) -- Don't check kinds for updates to coercion variables , not (ty_kind `isSubKind` tv_kind) - = WARN( True, hang (text "Ill-kinded update to meta tyvar") + = WARN( dflags, True, hang (text "Ill-kinded update to meta tyvar") 2 (ppr tyvar $$ ppr tv_kind $$ ppr ty $$ ppr ty_kind) ) return () @@ -543,7 +543,7 @@ zonkQuantifiedTyVar :: TcTyVar -> TcM TcTyVar zonkQuantifiedTyVar tv = ASSERT2( isTcTyVar tv, ppr tv ) case tcTyVarDetails tv of - SkolemTv {} -> WARN( True, ppr tv ) -- Dec10: Can this really happen? + SkolemTv {} -> WARN( dflags, True, ppr tv ) -- Dec10: Can this really happen? do { kind <- zonkTcType (tyVarKind tv) ; return $ setTyVarKind tv kind } -- It might be a skolem type variable, @@ -556,7 +556,7 @@ zonkQuantifiedTyVar tv (readMutVar _ref >>= \cts -> case cts of Flexi -> return () - Indirect ty -> WARN( True, ppr tv $$ ppr ty ) + Indirect ty -> WARN( dflags, True, ppr tv $$ ppr ty ) return ()) >> #endif skolemiseUnboundMetaTyVar tv vanillaSkolemTv diff --git a/compiler/typecheck/TcRnTypes.lhs b/compiler/typecheck/TcRnTypes.lhs index 17e5dcbb94..7733e1e2ab 100644 --- a/compiler/typecheck/TcRnTypes.lhs +++ b/compiler/typecheck/TcRnTypes.lhs @@ -650,7 +650,7 @@ plusImportAvails imp_finsts = finsts1 `unionLists` finsts2 } where plus_mod_dep (m1, boot1) (m2, boot2) - = WARN( not (m1 == m2), (ppr m1 <+> ppr m2) $$ (ppr boot1 <+> ppr boot2) ) + = WARN( dflags, not (m1 == m2), (ppr m1 <+> ppr m2) $$ (ppr boot1 <+> ppr boot2) ) -- Check mod-names match (m1, boot1 && boot2) -- If either side can "see" a non-hi-boot interface, use that \end{code} @@ -1077,7 +1077,7 @@ pprSkolInfo (InferSkol ids) = sep [ ptext (sLit "the inferred type of") -- UnkSkol -- For type variables the others are dealt with by pprSkolTvBinding. -- For Insts, these cases should not happen -pprSkolInfo UnkSkol = WARN( True, text "pprSkolInfo: UnkSkol" ) ptext (sLit "UnkSkol") +pprSkolInfo UnkSkol = WARN( dflags, True, text "pprSkolInfo: UnkSkol" ) ptext (sLit "UnkSkol") \end{code} |