X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FHsVersions.h;h=034a9bc07cf7de57540d6d372298d02db5404fd4;hp=f11aa214c416a667eae00ac55de5ff19addaf913;hb=71847273007b8346735f6ec34bfcc8750e2c6ecd;hpb=046ee54f048ddd721dcee41916d6a6f68db3b15b

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index f11aa21..034a9bc 100644
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -22,22 +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__ >= 602
+#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 602
 #define SYSTEM_IO_ERROR System.IO.Error
 #else
 #define SYSTEM_IO_ERROR System.IO
 #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. */
+#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
 #define GLOBAL_VAR(name,value,ty)  \
-name = Util.global (value) :: IORef (ty); \
-{-# NOINLINE name #-}
-#endif
-
-#if __GLASGOW_HASKELL__ >= 620
-#define UNBOX_FIELD !!
-#else
-#define UNBOX_FIELD !
+{-# NOINLINE name #-};             \
+name :: IORef (ty);                \
+name = Util.global (value);
 #endif
 
 #define COMMA ,
@@ -45,29 +42,43 @@ 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 && (not (e)) 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
+-- This conditional lets us switch off the "import FastString"
+-- when compiling FastString itself, or when compiling modules that
+-- don't use it (and would otherwise get warnings, which we treat
+-- as errors). Can we do this more nicely?
+#if !defined(COMPILING_FAST_STRING) && !defined(FAST_STRING_NOT_NEEDED)
 -- 
 import qualified FastString as FS 
 #endif
 
+#if defined(__GLASGOW_HASKELL__)
 #define SLIT(x)	 (FS.mkLitString# (x#))
 #define FSLIT(x) (FS.mkFastString# (x#))
+#else
+#define SLIT(x)  (FS.mkLitString (x))
+#define FSLIT(x) (FS.mkFastString (x))
+#endif
 
 -- 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