X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=abcaa994c975d9663365e2ef47d3a22613b50e7c;hb=f4a6a4134b8ba3f2fc7a193ed5b91313046b775a;hp=2e1b15404495f86f590c438813d7609948b3cb68;hpb=9dd6e1c216993624a2cd74b62ca0f0569c02c26b;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 2e1b154..abcaa99 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,14 +10,31 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
+#ifdef __GLASGOW_HASKELL__
+#define GLOBAL_VAR(name,value,ty)  \
+name = global (value) :: IORef (ty); \
+{-# NOINLINE name #-}
+#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))
 #else
 #define ASSERT(e)
 #define ASSERT2(e,msg)
+#define WARN(e,msg)
+#endif
+
+-- temporary usage assertion control KSW 2000-10
+#ifdef DO_USAGES
+#define UASSERT(e) ASSERT(e)
+#define UASSERT2(e,msg) ASSERT2(e,msg)
+#else
+#define UASSERT(e)
+#define UASSERT2(e,msg)
 #endif
 
 #if __STDC__
@@ -27,144 +44,41 @@ you will screw up the layout where they are used in case expressions!
 #endif
 
 #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 202
-# define REALLY_HASKELL_1_3
-# define SYN_IE(a) a
-# define EXP_MODULE(a) module a
-# define IMPORT_DELOOPER(mod) import mod
-# define IMPORT_1_3(mod) import mod
-# define _Addr Addr
-# define _ByteArray GlaExts.ByteArray
-# define _MutableByteArray GlaExts.MutableByteArray
-# define _MutableArray GlaExts.MutableArray
-# define _RealWorld GlaExts.RealWorld
-# define _ST GlaExts.ST
-# define _ForeignObj Foreign.ForeignObj
-# define _runST ST.runST
-# define seqStrictlyST seqST
-# define thenStrictlyST thenST
-# define returnStrictlyST return
-# define _readHandle IOHandle.readHandle
-# define _writeHandle IOHandle.writeHandle
-# define _newHandle   IOHandle.newdHandle
-# define MkST ST
-# if __GLASGOW_HASKELL__ >= 209
-#  define STATE_TOK(x)    x
-#  define ST_RET(x,y)     STret (y) (x)
-#  define unsafePerformST(x)  runST (x)
-#  define ST_TO_PrimIO(x) (stToIO (x))
-# else
-#  define STATE_TOK(x)  (S# x)
-#  define ST_RET(x,y)   (x,y)
-#  define unsafePerformST(x) unsafePerformPrimIO(x)
-#  define ST_TO_PrimIO(x) x
-# endif
 # define failWith fail
 # define MkIOError(h,errt,msg) (IOError (Just h) errt msg)
-# define CCALL_THEN thenIO_Prim
-# define _filePtr IOHandle.filePtr
-# define Text Show
-# define IMP_FASTSTRING() import FastString
-# if __GLASGOW_HASKELL__ >= 209
-#  define IMP_Ubiq() import GlaExts ; import Addr(Addr(..)); import FastString
-#  define CHK_Ubiq() import GlaExts ; import Addr(Addr(..)); import FastString
-# else
-#  define IMP_Ubiq() import GlaExts ; import FastString
-#  define CHK_Ubiq() import GlaExts ; import FastString
-# endif
 # define minInt (minBound::Int)
 # define maxInt (maxBound::Int)
 #else
-# define STATE_TOK(x)  (S# x)
-# define ST_RET(x,y)   (x,y)
-# define unsafePerformST(x) unsafePerformPrimIO(x)
-# define ST_TO_PrimIO(x) x
-# define SYN_IE(a) a(..)
-# define EXP_MODULE(a) a..
-# define IMPORT_DELOOPER(mod) import mod
-# define IMPORT_1_3(mod) {--}
-# define IMP_FASTSTRING() import FastString
-# define IMP_Ubiq() IMPORT_DELOOPER(Ubiq) ; import FastString
-# define CHK_Ubiq() IMPORT_DELOOPER(Ubiq) ; import FastString
-# define MkST
-# define CCALL_THEN thenPrimIO
 # define MkIOError(h,errt,msg) (errt msg)
 #endif
 
-#if defined(__GLASGOW_HASKELL__)
-
--- Import the beggars
-import GlaExts	( Int(..), Int#, (+#), (-#), (*#), 
-		  quotInt#, negateInt#, (==#), (<#), (<=#), (>=#), (>#)
-		)
-
-#define FAST_INT Int#
-#define ILIT(x) (x#)
-#define IBOX(x) (I# (x))
-#define _ADD_ +#
-#define _SUB_ -#
-#define _MUL_ *#
-#define _QUOT_ `quotInt#`
-#define _NEG_ negateInt#
-#define _EQ_ ==#
-#define _LT_ <#
-#define _LE_ <=#
-#define _GE_ >=#
-#define _GT_ >#
-
-#define FAST_BOOL Int#
-#define _TRUE_ 1#
-#define _FALSE_ 0#
-#define _IS_TRUE_(x) ((x) _EQ_ 1#)
-
-#else {- ! __GLASGOW_HASKELL__ -}
-
-#define FAST_INT Int
-#define ILIT(x) (x)
-#define IBOX(x) (x)
-#define _ADD_ +
-#define _SUB_ -
-#define _MUL_ *
-#define _DIV_ `div`
-#define _QUOT_ `quot`
-#define _NEG_ -
-#define _EQ_ ==
-#define _LT_ <
-#define _LE_ <=
-#define _GE_ >=
-#define _GT_ >
-
-#define FAST_BOOL Bool
-#define _TRUE_ True
-#define _FALSE_ False
-#define _IS_TRUE_(x) (x)
-
-#endif  {- ! __GLASGOW_HASKELL__ -}
-
 #if __GLASGOW_HASKELL__ >= 23
 
 -- This #ifndef lets us switch off the "import FastString"
 -- when compiling FastString itself
 #ifndef COMPILING_FAST_STRING
 -- 
-import FastString	( FastString, mkFastString, mkFastCharString#, nullFastString, 
-			  consFS, headFS, tailFS, lengthFS, unpackFS, appendFS, concatFS
-			)
+import qualified FastString 
 #endif
 
 # define USE_FAST_STRINGS 1
-# define FAST_STRING	FastString
-# define SLIT(x)	(mkFastCharString# (x#))
-# define _NULL_		nullFastString
-# define _NIL_		(mkFastString "")
-# define _CONS_		consFS
-# define _HEAD_		headFS
-# define _TAIL_		tailFS
-# define _LENGTH_	lengthFS
-# define _PK_		mkFastString
-# define _UNPK_		unpackFS
-# define _APPEND_	`appendFS`
-# define _CONCAT_	concatFS
+# define FAST_STRING	FastString.FastString
+# define SLIT(x)	(FastString.mkFastCharString# (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 _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
 # define SLIT(x)      (x)
 # define _CMP_STRING_ cmpString
@@ -181,4 +95,18 @@ import FastString	( FastString, mkFastString, mkFastCharString#, nullFastString,
 # 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