Make ASSERT2 mention msg even when debug is off (avoid warnings)

[ghc-hetmet.git] / compiler / HsVersions.h

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index dd80922..4e68bbe 100644 (file)
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -22,52 +22,19 @@ you will screw up the layout where they are used in case expressions!
  * settings for the target plat instead). */
 #include "../includes/ghcautoconf.h"
 
-#if __GLASGOW_HASKELL__ >= 504
-
-#define CONCURRENT  Control.Concurrent
-#define EXCEPTION   Control.Exception
-     /* If you want Control.Exception.try, get it as Panic.try, which
-        deals with the shift from 'tryAllIO' to 'try'.  */
-#define DYNAMIC     Data.Dynamic
-#define GLAEXTS     GHC.Exts
-#define DATA_BITS   Data.Bits
-#define DATA_INT    Data.Int
-#define DATA_WORD   Data.Word
-#define UNSAFE_IO   System.IO.Unsafe
-#define TRACE       Debug.Trace
-#define DATA_IOREF  Data.IORef
-#define FIX_IO      System.IO
-#define MONAD_ST    Control.Monad.ST
-#define ST_ARRAY    Data.Array.ST
-
-#else
-
-#define CONCURRENT  Concurrent
-#define EXCEPTION   Exception
-#define DYNAMIC     Dynamic
-#define GLAEXTS     GlaExts
-#define DATA_BITS   Bits
-#define DATA_INT    Int
-#define DATA_WORD   Word
-#define UNSAFE_IO   IOExts
-#define TRACE       IOExts
-#define DATA_IOREF  IOExts
-#define FIX_IO      IOExts
-#define MONAD_ST    ST
-#define ST_ARRAY    ST
-
-#endif
-
-#ifdef __GLASGOW_HASKELL__
+/* Global variables may not work in other Haskell implementations,
+ * but we need them currently! so the conditional on GLASGOW won't do. */
+#ifndef __HADDOCK__
+#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
 #define GLOBAL_VAR(name,value,ty)  \
-name = Util.global (value) :: IORef (ty); \
-{-# NOINLINE name #-}
+{-# NOINLINE name #-};             \
+name :: IORef (ty);                \
+name = Util.global (value);
 #endif
-
-#if __GLASGOW_HASKELL__ >= 620
-#define UNBOX_FIELD !!
-#else
-#define UNBOX_FIELD !
+#else /* __HADDOCK__ */
+#define GLOBAL_VAR(name,value,ty)  \
+name :: IORef (ty);                \
+name = Util.global (value);
 #endif
 
 #define COMMA ,
@@ -75,29 +42,26 @@ name = Util.global (value) :: IORef (ty); \
 #ifdef DEBUG
 #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 MASSERT(e)      ASSERT(e) return ()
+#define MASSERT2(e,msg) ASSERT2(e,msg) return ()
 #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 ASSERT(e)      if False then error "ASSERT"  else
-#define ASSERT2(e,msg) if False then error "ASSERT2" else
-#define ASSERTM(e)
-#define ASSERTM2(e,msg)
-#define WARN(e,msg)    if False then error "WARN"    else
+-- 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 && (const False (e,msg)) then pprPanic "ASSERT2" (msg) else
+#define MASSERT(e)      ASSERT(e) return ()
+#define MASSERT2(e,msg) ASSERT2(e,msg) return ()
+#define ASSERTM(e)       do { let { _mbool = (e) } }
+-- 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"
--- when compiling FastString itself
-#ifndef COMPILING_FAST_STRING
--- 
-import qualified FastString as FS 
-#endif
-
-#define SLIT(x)         (FS.mkLitString# (x#))
-#define FSLIT(x) (FS.mkFastString# (x#))
-
 -- Useful for declaring arguments to be strict
-#define STRICT1(f) f a b c | a `seq` False = undefined
+#define STRICT1(f) f a | a `seq` False = undefined
 #define STRICT2(f) f a b | a `seq` b `seq` False = undefined
 #define STRICT3(f) f a b c | a `seq` b `seq` c `seq` False = undefined
 #define STRICT4(f) f a b c d | a `seq` b `seq` c `seq` d `seq` False = undefined