X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=464bf820297d5b74ba15697b8b159aff9ddca20c;hb=1d1c3c727617630beacacaf33022e1daba06a0bb;hp=fb47f7cba521d4fee18d387e687fe8ad3243ebc9;hpb=cd14f4675f2ba7a2354a8b1bad3e68dd4ba61642;p=ghc-hetmet.git

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index fb47f7c..464bf82 100644
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -37,19 +37,22 @@ name = Util.global (value) :: IORef (ty); \
 #define COMMA ,
 
 #ifdef DEBUG
+#define debugIsOn True
 #define ASSERT(e) if (not (e)) then (assertPanic __FILE__ __LINE__) else
 #define ASSERT2(e,msg) if (not (e)) then (assertPprPanic __FILE__ __LINE__ (msg)) else
 #define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
 #define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () }
 #define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () }
 #else
+#define debugIsOn False
 -- We have to actually use all the variables we are given or we may get
 -- unused variable warnings when DEBUG is off.
 #define ASSERT(e)      if False && (not (e)) then panic "ASSERT" else
 #define ASSERT2(e,msg) if False && (not (e)) then pprPanic "ASSERT2" (msg) else
 #define ASSERTM(e)       do { let { _mbool = (e) } }
-#define ASSERTM2(e,msg)  do { let { _mbool = (e) }; when False (panic "ASSERTM2") }
-#define WARN(e,msg)    if False && (e) then pprPanic "WARN" msg else
+-- Here we deliberately don't use when as Control.Monad might not be imported
+#define ASSERTM2(e,msg)  do { let { _mbool = (e) }; if False then panic "ASSERTM2" else return () }
+#define WARN(e,msg)    if False && (e) then pprPanic "WARN" (msg) else
 #endif
 
 -- This #ifndef lets us switch off the "import FastString"