X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=f6acb0acb62b7f5c97529b4b206033e988430014;hb=94ff1ec1546169fc839b2318c0d141f3089d3e26;hp=6a01f6858d8a5180779bacb49b07415b3a800e0f;hpb=ca5a4a480d10d61e5b7a52eb4d556e8b8c33e69d;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 6a01f68..f6acb0a 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -10,47 +10,110 @@ you will screw up the layout where they are used in case expressions!
 
 #endif
 
-#ifdef __GLASGOW_HASKELL__
-#define TAG_ Int#
-#define LT_ -1#
-#define EQ_ 0#
-#define GT_ 1#
-#endif
-#define GT__ _
-
 #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
-#define CHK_Ubiq() import Ubiq
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 26
-#define trace _trace
+#if __STDC__
+#define CAT2(a,b)a##b
+#else
+#define CAT2(a,b)a/**/b
+#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 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 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_ `plusInt#`
-#define _SUB_ `minusInt#`
-#define _MUL_ `timesInt#`
-#define _DIV_ `divInt#`
+#define _ADD_ +#
+#define _SUB_ -#
+#define _MUL_ *#
 #define _QUOT_ `quotInt#`
 #define _NEG_ negateInt#
-#define _EQ_ `eqInt#`
-#define _LT_ `ltInt#`
-#define _LE_ `leInt#`
-#define _GE_ `geInt#`
-#define _GT_ `gtInt#`
+#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) `eqInt#` 1#)
+#define _IS_TRUE_(x) ((x) _EQ_ 1#)
 
 #else {- ! __GLASGOW_HASKELL__ -}
 
@@ -77,36 +140,52 @@ you will screw up the layout where they are used in case expressions!
 #endif  {- ! __GLASGOW_HASKELL__ -}
 
 #if __GLASGOW_HASKELL__ >= 23
-#define USE_FAST_STRINGS 1
-#define FAST_STRING _PackedString
-#define SLIT(x)	    (_packCString (A# x#))
-#define _CMP_STRING_ cmpPString
-#define _NULL_	    _nullPS
-#define _NIL_	    _nilPS
-#define _CONS_	    _consPS
-#define _HEAD_	    _headPS
-#define _TAIL_	    _tailPS
-#define _LENGTH_    _lengthPS
-#define _PK_	    _packString
-#define _UNPK_	    _unpackPS
-#define _SUBSTR_    _substrPS
-#define _APPEND_    `_appendPS`
-#define _CONCAT_    _concatPS
+
+-- This #ifndef lets us switch off the "import FastString"
+-- when compiling FastString itself
+#ifndef COMPILING_FAST_STRING
+-- 
+import qualified FastString 
+#endif
+
+# define USE_FAST_STRINGS 1
+# 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 _TAIL_		FastString.tailFS
+# define _LENGTH_	FastString.lengthFS
+# define _PK_		FastString.mkFastString
+# define _UNPK_		FastString.unpackFS
+# define _APPEND_	`FastString.appendFS`
+# define _CONCAT_	FastString.concatFS
+#else
+# 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_     ++
+# define _CONCAT_     concat
+#endif
+
+#if __HASKELL1__ > 4
+#define FMAP fmap
+#define ISALPHANUM isAlphaNum
+#define IOERROR ioError
 #else
-#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_    ++
-#define _CONCAT_    concat
+#define FMAP map
+#define ISALPHANUM isAlphanum
+#define IOERROR fail
 #endif
 
 #endif