Merge pull request #2081 from bettio/safe-macro

Use `do { ... } while (0)` for multi-statement macros

These changes are made under both the "Apache 2.0" and the "GNU Lesser General
Public License 2.1 or later" license terms (dual license).

SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1-or-later

Author: bettio

src/libAtomVM/bif.c

@@ -43,10 +43,12 @@
 #include "bifs_hash.h"
 #pragma GCC diagnostic pop
 
-#define RAISE_ERROR(error_type_atom) \
-    ctx->x[0] = ERROR_ATOM;          \
-    ctx->x[1] = (error_type_atom);   \
-    return term_invalid_term();
+#define RAISE_ERROR(error_type_atom)   \
+    do {                               \
+        ctx->x[0] = ERROR_ATOM;        \
+        ctx->x[1] = (error_type_atom); \
+        return term_invalid_term();    \
+    } while (0);
 
 #define RAISE_ERROR_BIF(fail_label, error_type_atom) \
     if (fail_label == 0) {                           \

src/libAtomVM/nifs.h

@@ -41,10 +41,12 @@ extern "C" {
         return term_invalid_term();            \
     }
 
-#define RAISE_ERROR(error_type_atom) \
-    ctx->x[0] = ERROR_ATOM;          \
-    ctx->x[1] = (error_type_atom);   \
-    return term_invalid_term();
+#define RAISE_ERROR(error_type_atom)   \
+    do {                               \
+        ctx->x[0] = ERROR_ATOM;        \
+        ctx->x[1] = (error_type_atom); \
+        return term_invalid_term();    \
+    } while (0);
 
 const struct Nif *nifs_get(const char *mfa);
 

src/platforms/generic_unix/lib/platform_nifs.c

@@ -37,18 +37,6 @@
 // #define ENABLE_TRACE
 #include "trace.h"
 
-#define VALIDATE_VALUE(value, verify_function) \
-    if (UNLIKELY(!verify_function((value)))) { \
-        argv[0] = ERROR_ATOM;                  \
-        argv[1] = BADARG_ATOM;                 \
-        return term_invalid_term();            \
-    }
-
-#define RAISE_ERROR(error_type_atom) \
-    ctx->x[0] = ERROR_ATOM;          \
-    ctx->x[1] = (error_type_atom);   \
-    return term_invalid_term();
-
 #if ATOMVM_HAS_MBEDTLS
 
 // declared in otp_crypt