From 7163be78dfc760f2b288c78260cb2929b6253aa1 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 29 Mar 2008 13:59:50 +0000 Subject: [PATCH] Convert some DEBUG uses to debugIsOn --- compiler/basicTypes/VarEnv.lhs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/compiler/basicTypes/VarEnv.lhs b/compiler/basicTypes/VarEnv.lhs index a9690f1..67bc120 100644 --- a/compiler/basicTypes/VarEnv.lhs +++ b/compiler/basicTypes/VarEnv.lhs @@ -45,6 +45,7 @@ import Util import Maybes import Outputable import FastTypes +import StaticFlags \end{code} @@ -130,16 +131,12 @@ uniqAway' (InScope set n) var where orig_unique = getUnique var try k -#ifdef DEBUG - | k ># _ILIT(1000) + | debugIsOn && (k ># _ILIT(1000)) = pprPanic "uniqAway loop:" (ppr (iBox k) <+> text "tries" <+> ppr var <+> int (iBox n)) -#endif | uniq `elemVarSetByKey` set = try (k +# _ILIT(1)) -#ifdef DEBUG - | opt_PprStyle_Debug && k ># _ILIT(3) + | debugIsOn && opt_PprStyle_Debug && (k ># _ILIT(3)) = pprTrace "uniqAway:" (ppr (iBox k) <+> text "tries" <+> ppr var <+> int (iBox n)) setVarUnique var uniq -#endif | otherwise = setVarUnique var uniq where uniq = deriveUnique orig_unique (iBox (n *# k)) -- 1.7.10.4