diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-05-25 19:07:51 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-05-25 20:47:26 +0100 |
| commit | a5f5a70c41b4bce2715bf5d478171fbaf060cddf (patch) | |
| tree | e9be157af01bcb2c9a4ac51e01d3b9c71c0d4307 /compiler/types | |
| parent | ea3a9edda14f952042fa262abd37cc4fa0c1dd6d (diff) | |
| download | haskell-sdoc.tar.gz | |
More DynFlags + SDocsdoc
Diffstat (limited to 'compiler/types')
| -rw-r--r-- | compiler/types/Coercion.lhs | 2 | ||||
| -rw-r--r-- | compiler/types/OptCoercion.lhs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/types/Coercion.lhs b/compiler/types/Coercion.lhs index 7df5b8e38f..9fc3c6e89e 100644 --- a/compiler/types/Coercion.lhs +++ b/compiler/types/Coercion.lhs @@ -870,7 +870,7 @@ substCoVar :: CvSubst -> CoVar -> Coercion substCoVar (CvSubst in_scope _ cenv) cv | Just co <- lookupVarEnv cenv cv = co | Just cv1 <- lookupInScope in_scope cv = ASSERT( isCoVar cv1 ) CoVarCo cv1 - | otherwise = WARN( True, ptext (sLit "substCoVar not in scope") <+> ppr cv ) + | otherwise = WARN( dflags, True, ptext (sLit "substCoVar not in scope") <+> ppr cv ) ASSERT( isCoVar cv ) CoVarCo cv substCoVars :: CvSubst -> [CoVar] -> [Coercion] diff --git a/compiler/types/OptCoercion.lhs b/compiler/types/OptCoercion.lhs index eef1ccf672..aa5af1dd72 100644 --- a/compiler/types/OptCoercion.lhs +++ b/compiler/types/OptCoercion.lhs @@ -70,9 +70,10 @@ opt_co env sym co = pprTrace "opt_co {" (ppr sym <+> ppr co $$ ppr env) $ co1 `seq` pprTrace "opt_co done }" (ppr co1) $ - (WARN( not same_co_kind, ppr co <+> dcolon <+> pprEqPred (Pair s1 t1) + (WARN( dflags, + not same_co_kind, ppr co <+> dcolon <+> pprEqPred (Pair s1 t1) $$ ppr co1 <+> dcolon <+> pprEqPred (Pair s2 t2) ) - WARN( not (coreEqCoercion co1 simple_result), + WARN( dflags, not (coreEqCoercion co1 simple_result), (text "env=" <+> ppr env) $$ (text "input=" <+> ppr co) $$ (text "simple=" <+> ppr simple_result) $$ @@ -106,7 +107,7 @@ opt_co' env sym (CoVarCo cv) = ASSERT( isCoVar cv1 ) wrapSym sym (CoVarCo cv1) -- cv1 might have a substituted kind! - | otherwise = WARN( True, ptext (sLit "opt_co: not in scope:") <+> ppr cv $$ ppr env) + | otherwise = WARN( dflags, True, ptext (sLit "opt_co: not in scope:") <+> ppr cv $$ ppr env) ASSERT( isCoVar cv ) wrapSym sym (CoVarCo cv) |