X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=0bd9c142c4a42a0e9eb8cd86aa9d28393cf758ff;hb=d1f512dc5379536f0b75ab7e7be5933d0226b0ec;hp=4900e5663abbd9bd6b4339a9682c1c60131576ad;hpb=0171936c9092666692c69a7f93fa75af976330cb;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 4900e56..0bd9c14 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,22 +10,66 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
+#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__
 #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 !
+#endif
+
 #define COMMA ,
 
 #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 WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
+#define ASSERTM(e) ASSERT(e) do
 #else
-#define ASSERT(e)
-#define ASSERT2(e,msg)
-#define WARN(e,msg)
+#define ASSERT(e)      if False then error "ASSERT"  else
+#define ASSERT2(e,msg) if False then error "ASSERT2" else
+#define ASSERTM(e)
+#define WARN(e,msg)    if False then error "WARN"    else
 #endif
 
 -- temporary usage assertion control KSW 2000-10
@@ -37,8 +81,6 @@ name = Util.global (value) :: IORef (ty); \
 #define UASSERT2(e,msg)
 #endif
 
-#if __GLASGOW_HASKELL__ >= 23
-
 -- This #ifndef lets us switch off the "import FastString"
 -- when compiling FastString itself
 #ifndef COMPILING_FAST_STRING
@@ -46,36 +88,8 @@ name = Util.global (value) :: IORef (ty); \
 import qualified FastString 
 #endif
 
-# define USE_FAST_STRINGS 1
-# define FAST_STRING	FastString.FastString
-# define SLIT(x)	(FastString.mkFastCharString# (x#))
-# define FSLIT(x)	(FastString.mkFastString# (x#))
-# define _NULL_		FastString.nullFastString
-# define _NIL_		(FastString.mkFastString "")
-# define _CONS_		FastString.consFS
-# define _HEAD_		FastString.headFS
-# define _HEAD_INT_	FastString.headIntFS
-# define _TAIL_		FastString.tailFS
-# define _LENGTH_	FastString.lengthFS
-# define _PK_		FastString.mkFastString
-# define _UNPK_		FastString.unpackFS
-# define _UNPK_INT_	FastString.unpackIntFS
-# define _APPEND_	`FastString.appendFS`
-#else
-# error I think that FastString is now always used. If not, fix this.
-# define FAST_STRING String
-# define SLIT(x)      (x)
-# define _CMP_STRING_ cmpString
-# define _NULL_	      null
-# define _NIL_	      ""
-# define _CONS_	      (:)
-# define _HEAD_	      head
-# define _TAIL_	      tail
-# define _LENGTH_     length
-# define _PK_	      (\x->x)
-# define _UNPK_	      (\x->x)
-# define _SUBSTR_     substr{-from Utils-}
-# define _APPEND_     ++
-#endif
+#define SLIT(x)	 (FastString.mkLitString# (x#))
+#define FSLIT(x) (FastString.mkFastString# (x#))
+
+#endif /* HsVersions.h */
 
-#endif