From: Twan van Laarhoven Date: Thu, 17 Jan 2008 16:31:12 +0000 (+0000) Subject: Added MASSERT macro for assertions in do notation X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8d620ddd37d883329f63ad91fbe68142c738ba3c Added MASSERT macro for assertions in do notation --- diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h index dcab3c1..530b0fa 100644 --- a/compiler/HsVersions.h +++ b/compiler/HsVersions.h @@ -42,6 +42,8 @@ name = Util.global (value) :: IORef (ty); \ #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 () +#define MASSERT2(e,msg) ASSERT2(e,msg) return () #define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg)) #define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () } #define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () } @@ -51,6 +53,8 @@ name = Util.global (value) :: IORef (ty); \ -- unused variable warnings when DEBUG is off. #define ASSERT(e) if False && (not (e)) then panic "ASSERT" else #define ASSERT2(e,msg) if False && (not (e)) then pprPanic "ASSERT2" (msg) else +#define MASSERT(e) ASSERT(e) return () +#define MASSERT2(e,msg) ASSERT2(e,msg) return () #define ASSERTM(e) do { let { _mbool = (e) } } -- Here we deliberately don't use when as Control.Monad might not be imported #define ASSERTM2(e,msg) do { let { _mbool = (e) }; if False then panic "ASSERTM2" else return () }