Move mem check macros to memcheck.h

extension/boolexpr/Makefile

@@ -41,7 +41,7 @@ all: bld/test/run bld/cover/run bld/lib/libboolexpr.a
 # Source Code
 #===============================================================================
 
-BOOLEXPR_HDRS := boolexpr.h primes-inl.c
+BOOLEXPR_HDRS := boolexpr.h memcheck.h primes-inl.c
 
 BOOLEXPR_SRCS := \
     argset.c \

extension/boolexpr/argset.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* boolexpr.c */

extension/boolexpr/binary.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* boolexpr.c */

extension/boolexpr/boolexpr.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 #define READ_ARGS(n, xs) \

extension/boolexpr/boolexpr.h

@@ -12,54 +12,6 @@ extern "C" {
 #endif
 
 
-#define CHECK_NULL(y, x) \
-do { \
-    if ((y = x) == NULL) \
-        return NULL; \
-} while (0)
-
-
-#define CHECK_NULL_1(y, x, temp) \
-do { \
-    if ((y = x) == NULL) { \
-        BX_DecRef(temp); \
-        return NULL; \
-    } \
-} while (0)
-
-
-#define CHECK_NULL_2(y, x, t0, t1) \
-do { \
-    if ((y = x) == NULL) { \
-        BX_DecRef(t0); \
-        BX_DecRef(t1); \
-        return NULL; \
-    } \
-} while (0)
-
-
-#define CHECK_NULL_3(y, x, t0, t1, t2) \
-do { \
-    if ((y = x) == NULL) { \
-        BX_DecRef(t0); \
-        BX_DecRef(t1); \
-        BX_DecRef(t2); \
-        return NULL; \
-    } \
-} while (0)
-
-
-#define CHECK_NULL_N(y, x, n, temps) \
-do { \
-    if ((y = x) == NULL) { \
-        for (size_t i = 0; i < n; ++i) \
-            BX_DecRef(temps[i]); \
-        free(temps); \
-        return NULL; \
-    } \
-} while (0)
-
-
 /* Kind checks */
 #define IS_ZERO(ex)  (((ex)->kind) == ZERO)
 #define IS_ONE(ex)   (((ex)->kind) == ONE)

extension/boolexpr/bubble.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* util.c */

extension/boolexpr/compose.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* boolexpr.c */

extension/boolexpr/flatten.c

@@ -11,6 +11,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 #define DUAL(kind) (OP_OR + OP_AND - kind)

extension/boolexpr/memcheck.h

@@ -0,0 +1,61 @@
+/*
+** Filename: memcheck.h
+**
+** Convenience macros for checking memory allocation
+*/
+
+
+#ifndef MEMCHECK_H
+#define MEMCHECK_H
+
+
+#define CHECK_NULL(y, x) \
+do { \
+    if ((y = x) == NULL) \
+        return NULL; \
+} while (0)
+
+
+#define CHECK_NULL_1(y, x, temp) \
+do { \
+    if ((y = x) == NULL) { \
+        BX_DecRef(temp); \
+        return NULL; \
+    } \
+} while (0)
+
+
+#define CHECK_NULL_2(y, x, t0, t1) \
+do { \
+    if ((y = x) == NULL) { \
+        BX_DecRef(t0); \
+        BX_DecRef(t1); \
+        return NULL; \
+    } \
+} while (0)
+
+
+#define CHECK_NULL_3(y, x, t0, t1, t2) \
+do { \
+    if ((y = x) == NULL) { \
+        BX_DecRef(t0); \
+        BX_DecRef(t1); \
+        BX_DecRef(t2); \
+        return NULL; \
+    } \
+} while (0)
+
+
+#define CHECK_NULL_N(y, x, n, temps) \
+do { \
+    if ((y = x) == NULL) { \
+        for (size_t i = 0; i < n; ++i) \
+            BX_DecRef(temps[i]); \
+        free(temps); \
+        return NULL; \
+    } \
+} while (0)
+
+
+#endif // MEMCHECK_H
+

extension/boolexpr/nnf.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* nnf.c */

extension/boolexpr/product.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* array.c */

extension/boolexpr/simple.c

@@ -21,6 +21,8 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
+
 
 #define CMP(x, y) ((x) < (y) ? -1 : (x) > (y))
 

extension/boolexpr/util.c

@@ -9,6 +9,7 @@
 #include <stdlib.h>
 
 #include "boolexpr.h"
+#include "memcheck.h"
 
 
 /* boolexpr.c */