X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/f50c1365107c09453531f01bcaebc3b197c3627f..c91413e6acbc8d157ff52ceb8cd78cee97403584:/utils/macros.h

diff --git a/utils/macros.h b/utils/macros.h
index 9e27a48..95d0ddb 100644
--- a/utils/macros.h
+++ b/utils/macros.h
@@ -51,12 +51,40 @@
 #define GLUE(x, y) MLIB__GLUE(x, y)
 
 #ifdef static_assert
-#  define STATIC_ASSERT(cond, msg) static_assert(cond, msg)
+#  define STATIC_ASSERT(cond, msg) static_assert(!!(cond), msg)
 #else
 #  define STATIC_ASSERT(cond, msg)					\
 	IGNORABLE extern char static_assert_failed[2*!!(cond) - 1]
 #endif
 
+#define COMMA ,
+
+/*----- String and character hacks ----------------------------------------*/
+
+#define CTYPE_HACK(func, ch) (func((unsigned char)(ch)))
+
+#define ISALNUM(ch) CTYPE_HACK(isalnum, ch)
+#define ISALPHA(ch) CTYPE_HACK(isalpha, ch)
+#define ISASCII(ch) CTYPE_HACK(isascii, ch)
+#define ISBLANK(ch) CTYPE_HACK(isblank, ch)
+#define ISCNTRL(ch) CTYPE_HACK(iscntrl, ch)
+#define ISDIGIT(ch) CTYPE_HACK(isdigit, ch)
+#define ISGRAPH(ch) CTYPE_HACK(isgraph, ch)
+#define ISLOWER(ch) CTYPE_HACK(islower, ch)
+#define ISPRINT(ch) CTYPE_HACK(isprint, ch)
+#define ISPUNCT(ch) CTYPE_HACK(ispunct, ch)
+#define ISSPACE(ch) CTYPE_HACK(isspace, ch)
+#define ISUPPER(ch) CTYPE_HACK(isupper, ch)
+#define ISXDIGIT(ch) CTYPE_HACK(isxdigit, ch)
+
+#define TOASCII(ch) CTYPE_HACK(toascii, ch)
+#define TOLOWER(ch) CTYPE_HACK(tolower, ch)
+#define TOUPPER(ch) CTYPE_HACK(toupper, ch)
+
+#define MEMCMP(x, op, y, n) (memcmp((x), (y), (n)) op 0)
+#define STRCMP(x, op, y) (strcmp((x), (y)) op 0)
+#define STRNCMP(x, op, y, n) (strncmp((x), (y), (n)) op 0)
+
 /*----- Compiler diagnostics ----------------------------------------------*/
 
 /* --- Compiler-specific definitions --- */
@@ -68,6 +96,10 @@
 #  define IGNORABLE __attribute__((__unused__))
 #endif
 
+#if GCC_VERSION_P(3, 4) || CLANG_VERSION_P(3, 3)
+#  define MUST_CHECK __attribute__((__warn_unused_result__))
+#endif
+
 #if GCC_VERSION_P(4, 5) || CLANG_VERSION_P(3, 3)
 #  define DEPRECATED(msg) __attribute__((__deprecated__(msg)))
 #elif GCC_VERSION_P(3, 1)
@@ -78,6 +110,12 @@
 #  define EXECL_LIKE(ntrail) __attribute__((__sentinel__(ntrail)))
 #endif
 
+#if GCC_VERSION_P(2, 7) || CLANG_VERSION_P(0, 0)
+#  define LAUNDER(x)							\
+	({ __typeof__(x) _y; __asm__("" : "=g"(_y) : "0"(x)); _y; })
+#  define RELAX do __asm__ __volatile__("" ::: "memory"); while (0)
+#endif
+
 #if CLANG_VERSION_P(3, 3)
 
 #  define MLIB__PRAGMA_HACK(x) _Pragma(#x)
@@ -95,7 +133,9 @@
 #  define MUFFLE_WARNINGS_STMT(warns, body)				\
 	do { MLIB__MUFFLE_WARNINGS(warns, body) } while (0)
 
-#elif GCC_VERSION_P(4, 6)
+#endif
+
+#if GCC_VERSION_P(4, 6)
 
    /* --- Diagnostic suppression in GCC: a tale of woe --- *
     *
@@ -197,6 +237,18 @@
 #  define IGNORABLE
 #endif
 
+#ifndef MUST_CHECK
+#  define MUST_CHECK
+#endif
+
+#ifndef LAUNDER
+#  define LAUNDER
+#endif
+
+#ifndef RELAX
+#  define RELAX
+#endif
+
 #ifndef GCC_WARNING
 #  define GCC_WARNING(warn)
 #endif