[project @ 2002-03-04 17:01:26 by simonmar]

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

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 6a01f68..4900e56 100644 (file)
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -11,102 +11,71 @@ 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#
+#define GLOBAL_VAR(name,value,ty)  \
+name = Util.global (value) :: IORef (ty); \
+{-# NOINLINE name #-}
 #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
+-- 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 defined(__GLASGOW_HASKELL__)
-#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 _QUOT_ `quotInt#`
-#define _NEG_ negateInt#
-#define _EQ_ `eqInt#`
-#define _LT_ `ltInt#`
-#define _LE_ `leInt#`
-#define _GE_ `geInt#`
-#define _GT_ `gtInt#`
-
-#define FAST_BOOL Int#
-#define _TRUE_ 1#
-#define _FALSE_ 0#
-#define _IS_TRUE_(x) ((x) `eqInt#` 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)
+#if __GLASGOW_HASKELL__ >= 23
 
-#endif  {- ! __GLASGOW_HASKELL__ -}
+-- This #ifndef lets us switch off the "import FastString"
+-- when compiling FastString itself
+#ifndef COMPILING_FAST_STRING
+-- 
+import qualified FastString 
+#endif
 
-#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
+# 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
-#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
+# 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
 
 #endif