[project @ 2002-03-27 12:09:00 by simonpj]

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

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 3da1db1..4900e56 100644 (file)
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -12,7 +12,7 @@ you will screw up the layout where they are used in case expressions!
 
 #ifdef __GLASGOW_HASKELL__
 #define GLOBAL_VAR(name,value,ty)  \
-name = global (value) :: IORef (ty); \
+name = Util.global (value) :: IORef (ty); \
 {-# NOINLINE name #-}
 #endif
 
@@ -28,19 +28,13 @@ name = global (value) :: IORef (ty); \
 #define WARN(e,msg)
 #endif
 
-#if __STDC__
-#define CAT2(a,b)a##b
+-- temporary usage assertion control KSW 2000-10
+#ifdef DO_USAGES
+#define UASSERT(e) ASSERT(e)
+#define UASSERT2(e,msg) ASSERT2(e,msg)
 #else
-#define CAT2(a,b)a/**/b
-#endif
-
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 202
-# define failWith fail
-# define MkIOError(h,errt,msg) (IOError (Just h) errt msg)
-# define minInt (minBound::Int)
-# define maxInt (maxBound::Int)
-#else
-# define MkIOError(h,errt,msg) (errt msg)
+#define UASSERT(e)
+#define UASSERT2(e,msg)
 #endif
 
 #if __GLASGOW_HASKELL__ >= 23
@@ -55,6 +49,7 @@ import qualified FastString
 # 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
@@ -63,11 +58,9 @@ import qualified FastString
 # define _TAIL_                FastString.tailFS
 # define _LENGTH_      FastString.lengthFS
 # define _PK_          FastString.mkFastString
-# define _PK_INT_      FastString.mkFastStringInt
 # define _UNPK_                FastString.unpackFS
 # define _UNPK_INT_    FastString.unpackIntFS
 # define _APPEND_      `FastString.appendFS`
-# define _CONCAT_      FastString.concatFS
 #else
 # error I think that FastString is now always used. If not, fix this.
 # define FAST_STRING String
@@ -83,21 +76,6 @@ import qualified FastString
 # define _UNPK_              (\x->x)
 # define _SUBSTR_     substr{-from Utils-}
 # define _APPEND_     ++
-# define _CONCAT_     concat
-#endif
-
-#if __HASKELL1__ > 4
-# define FMAP fmap
-# define ISALPHANUM isAlphaNum
-# define IOERROR ioError
-# define PSEQ seq
-# define SAPPLY $!
-#else
-# define FMAP map
-# define ISALPHANUM isAlphanum
-# define IOERROR fail
-# define PSEQ (\x y -> y)
-# define SAPPLY $
 #endif
 
 #endif