Hmmmm

Author: bjackson312006

middleware/include/bitstream.h

@@ -8,12 +8,6 @@
 #include <stddef.h>
 #include <math.h>
 
-/* Throws a compile-time error if the assert fails */
-#define STATIC_ASSERT(condition, message)                                       \
-	do {                                                                    \
-		typedef char static_assertion_##__LINE__[(condition) ? 1 : -1]; \
-	} while (0)
-
 typedef struct {
 	uint8_t *data; // The bitstream data, stored as bytes
 	size_t bytes; // The number of bytes in the bitstream
@@ -36,31 +30,29 @@ void bitstream_init(bitstream_t *bitstream, uint8_t *data, size_t bytes);
  * @param num_bits The length of the data in bits.
  * @return Returns 0 if successful, -1 if there is insufficient space in the bitstream, and 1 if overflow occurs.
  */
-#define bitstream_add(bitstream, value, num_bits)                                                                            \
-	(/* Check bitstream parameter type */                                                                                \
-	 STATIC_ASSERT(                                                                                                      \
-		 __builtin_types_compatible_p(typeof(bitstream),                                                             \
-					      bitstream_t *),                                                                \
-		 "First argument of bitstream_add() must be a pointer to bitstream_t."), /* Check num_bits parameter type */ \
-	 STATIC_ASSERT(                                                                                                      \
-		 __builtin_types_compatible_p(typeof(num_bits), size_t),                                                     \
-		 "Third argument of bitstream_add() must be size_t."), /* Type dispatch */                                   \
-	 _Generic((value),                                                                                                   \
-		 uint8_t: bitstream_add_uint,                                                                                \
-		 uint16_t: bitstream_add_uint,                                                                               \
-		 uint32_t: bitstream_add_uint,                                                                               \
-		 int8_t: bitstream_add_int,                                                                                  \
-		 int16_t: bitstream_add_int,                                                                                 \
-		 int32_t: bitstream_add_int,                                                                                 \
-		 default: bitstream_add_unsupported_type)(bitstream, value,                                                  \
-							  num_bits))
+#define STATIC_ASSERT(condition, message)                                       \
+	do {                                                                    \
+		typedef char static_assertion_##__LINE__[(condition) ? 1 : -1]; \
+	} while (0)
+
+#define bitstream_add(bitstream, value, num_bits)                                        \
+	(STATIC_ASSERT(                                                                  \
+		 __builtin_types_compatible_p(typeof(bitstream),                         \
+					      bitstream_t *),                            \
+		 "First argument of bitstream_add() must be a pointer to bitstream_t."), \
+	 STATIC_ASSERT(__builtin_types_compatible_p(typeof(num_bits), size_t),           \
+		       "Third argument of bitstream_add() must be size_t."),             \
+	 _Generic((value),                                                               \
+		 uint8_t: bitstream_add_uint,                                            \
+		 uint16_t: bitstream_add_uint,                                           \
+		 uint32_t: bitstream_add_uint,                                           \
+		 int8_t: bitstream_add_int,                                              \
+		 int16_t: bitstream_add_int,                                             \
+		 int32_t: bitstream_add_int, )(bitstream, value, num_bits))
 
 /* Internal functions (not meant to be called directly). */
 /* Used by the bitstream_add() macro depending on the input data type. */
 int bitstream_add_uint(bitstream_t *bitstream, uint32_t value, size_t num_bits);
 int bitstream_add_int(bitstream_t *bitstream, int32_t value, size_t num_bits);
 
-/* This function will result in a compile-time error when called. */
-int bitstream_add_unsupported_type(void);
-
 #endif // BITSTREAM_H