X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FbasicTypes%2FVarEnv.lhs;h=4c31b24f09218144418782fce9e2d83df30ba241;hb=9367b24fde0c3f5efa5934e69571f5834ed43548;hp=a9690f1faf60281b39b5b55572799925ee659a4b;hpb=1af5e42b269a97a1abdd670d43bf8c30c753bc84;p=ghc-hetmet.git

diff --git a/compiler/basicTypes/VarEnv.lhs b/compiler/basicTypes/VarEnv.lhs
index a9690f1..4c31b24 100644
--- a/compiler/basicTypes/VarEnv.lhs
+++ b/compiler/basicTypes/VarEnv.lhs
@@ -23,7 +23,6 @@ module VarEnv (
 	extendInScopeSet, extendInScopeSetList, extendInScopeSetSet, 
 	modifyInScopeSet,
 	getInScopeVars, lookupInScope, elemInScopeSet, uniqAway, 
-	mapInScopeSet,
 
 	-- RnEnv2 and its operations
 	RnEnv2, mkRnEnv2, rnBndr2, rnBndrs2, rnOccL, rnOccR, inRnEnvL, inRnEnvR,
@@ -34,8 +33,6 @@ module VarEnv (
 	TidyEnv, emptyTidyEnv
     ) where
 
-#include "HsVersions.h"
-
 import OccName
 import Var
 import VarSet
@@ -45,6 +42,8 @@ import Util
 import Maybes
 import Outputable
 import FastTypes
+import StaticFlags
+import FastString
 \end{code}
 
 
@@ -61,7 +60,7 @@ data InScopeSet = InScope (VarEnv Var) FastInt
 	-- INVARIANT: it's not zero; we use it as a multiplier in uniqAway
 
 instance Outputable InScopeSet where
-  ppr (InScope s _) = ptext SLIT("InScope") <+> ppr s
+  ppr (InScope s _) = ptext (sLit "InScope") <+> ppr s
 
 emptyInScopeSet :: InScopeSet
 emptyInScopeSet = InScope emptyVarSet (_ILIT(1))
@@ -92,9 +91,6 @@ modifyInScopeSet (InScope in_scope n) old_v new_v = InScope (extendVarEnv in_sco
 delInScopeSet :: InScopeSet -> Var -> InScopeSet
 delInScopeSet (InScope in_scope n) v = InScope (in_scope `delVarEnv` v) n
 
-mapInScopeSet :: (Var -> Var) -> InScopeSet -> InScopeSet
-mapInScopeSet f (InScope in_scope n) = InScope (mapVarEnv f in_scope) n
-
 elemInScopeSet :: Var -> InScopeSet -> Bool
 elemInScopeSet v (InScope in_scope _) = v `elemVarEnv` in_scope
 
@@ -130,16 +126,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))