X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=14f14233fff58e588e90634f0e7b8bdd481b1d24;hb=05535340ae496c57ff218e016da6649ca1640754;hp=c8c09e6294197d077776f26a600b24d908a484e7;hpb=fc85319dfd71f7a642c1858fcdfa4b3d2a10acda;p=ghc-hetmet.git diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h index c8c09e6..14f1423 100644 --- a/compiler/HsVersions.h +++ b/compiler/HsVersions.h @@ -40,7 +40,6 @@ name = Util.global (value); #define COMMA , #ifdef DEBUG -#define debugIsOn True #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 MASSERT(e) ASSERT(e) return () @@ -49,7 +48,6 @@ name = Util.global (value); #define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () } #define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () } #else -#define debugIsOn False -- We have to actually use all the variables we are given or we may get -- unused variable warnings when DEBUG is off. #define ASSERT(e) if False && (not (e)) then panic "ASSERT" else @@ -62,23 +60,6 @@ name = Util.global (value); #define WARN(e,msg) if False && (e) then pprPanic "WARN" (msg) else #endif --- This conditional lets us switch off the "import FastString" --- when compiling FastString itself, or when compiling modules that --- don't use it (and would otherwise get warnings, which we treat --- as errors). Can we do this more nicely? -#if !defined(COMPILING_FAST_STRING) && !defined(FAST_STRING_NOT_NEEDED) --- -import qualified FastString as FS -#endif - -#if defined(__GLASGOW_HASKELL__) -#define SLIT(x) (FS.mkLitString# (x#)) -#define FSLIT(x) (FS.mkFastString# (x#)) -#else -#define SLIT(x) (FS.mkLitString (x)) -#define FSLIT(x) (FS.mkFastString (x)) -#endif - -- Useful for declaring arguments to be strict #define STRICT1(f) f a | a `seq` False = undefined #define STRICT2(f) f a b | a `seq` b `seq` False = undefined