admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix M_POD_OPLIST in C11 mode

Browse Source
This commit is contained in:
Patrick Pelissier committed 2018-10-26 20:18:32 +02:00
1 parent b9e26b1c2c
commit 3774f8fd11
1 file changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files
m-core.h
+9 -5
View File
@@ -1437,7 +1437,9 @@ M_PARSE_DEFAULT_TYPE_DEF(m_core_parse_ldouble, long double, strtold, )
This can seriously limit the _Generic statement. This can seriously limit the _Generic statement.
This macro overcomes this limitation by returning : This macro overcomes this limitation by returning :
* either the input 'x' if it is of type 'type', * either the input 'x' if it is of type 'type',
* or the value 0 view as a type 'type'. */ * or the value 0 view as a type 'type'.
Only works with pointers, integer or floats.
*/
#define M_AS_TYPE(type, x) _Generic((x)+0, type: (x), default: (type) 0) #define M_AS_TYPE(type, x) _Generic((x)+0, type: (x), default: (type) 0)
/* Return the minimum between x and y (computed in compile time) */ /* Return the minimum between x and y (computed in compile time) */
@@ -1709,21 +1711,23 @@ m_core_hash (const void *str, size_t length)
Macro encapsulation for C11: use specialized version of the hash function Macro encapsulation for C11: use specialized version of the hash function
if the type is recognized. if the type is recognized.
NOTE: Default case is not safe if the type is defined with the '[1]' trick. */ NOTE: Default case is not safe if the type is defined with the '[1]' trick. */
#define M_HASH_POD_DEFAULT(a) m_core_hash((const void*) &(a), sizeof (a))
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#define M_HASH_INT32(a) ( (a) ^ ((a) << 11) ^ M_HASH_SEED ) #define M_HASH_INT32(a) ( (a) ^ ((a) << 11) ^ M_HASH_SEED )
#define M_HASH_INT64(a) ( ( (a) >> 33 ) ^ (a) ^ ((a) << 11) ^ M_HASH_SEED ) #define M_HASH_INT64(a) ( ( (a) >> 33 ) ^ (a) ^ ((a) << 11) ^ M_HASH_SEED )
#define M_HASH_DEFAULT(a) \ #define M_HASH_DEFAULT(a) \
_Generic((a)+0, \ _Generic((a)+0, \
int32_t: M_HASH_INT32(M_ASSIGN_CAST(uint32_t, M_AS_TYPE(int32_t, a))), \ int32_t: M_HASH_INT32(M_ASSIGN_CAST(uint32_t, M_AS_TYPE(int32_t, a))), \
uint32_t: M_HASH_INT32(M_AS_TYPE(uint32_t, a)), \ uint32_t: M_HASH_INT32(M_AS_TYPE(uint32_t, a)), \
int64_t: M_HASH_INT64(M_ASSIGN_CAST(uint64_t, M_AS_TYPE(int64_t, a))), \ int64_t: M_HASH_INT64(M_ASSIGN_CAST(uint64_t, M_AS_TYPE(int64_t, a))), \
uint64_t: M_HASH_INT64(M_AS_TYPE(uint64_t, a)), \ uint64_t: M_HASH_INT64(M_AS_TYPE(uint64_t, a)), \
default: m_core_hash((const void*) &(a), sizeof (a)) ) default: M_HASH_POD_DEFAULT(a) )
#else #else
#define M_HASH_DEFAULT(a) m_core_hash((const void*) &(a), sizeof (a)) #define M_HASH_DEFAULT(a) M_HASH_POD_DEFAULT(a)
#endif #endif
/************************************************************/ /************************************************************/
/******************** METHODS handling **********************/ /******************** METHODS handling **********************/
/************************************************************/ /************************************************************/
@@ -2000,7 +2004,7 @@ m_core_hash (const void *str, size_t length)
#define M_POD_OPLIST \ #define M_POD_OPLIST \
(INIT(M_MEMSET_DEFAULT), INIT_SET(M_MEMCPY_DEFAULT), SET(M_MEMCPY_DEFAULT), \ (INIT(M_MEMSET_DEFAULT), INIT_SET(M_MEMCPY_DEFAULT), SET(M_MEMCPY_DEFAULT), \
CLEAR(M_NOTHING_DEFAULT), EQUAL(M_MEMCMP1_DEFAULT), CMP(M_MEMCMP2_DEFAULT), \ CLEAR(M_NOTHING_DEFAULT), EQUAL(M_MEMCMP1_DEFAULT), CMP(M_MEMCMP2_DEFAULT), \
HASH(M_HASH_DEFAULT), SWAP(M_SWAP_DEFAULT)) HASH(M_HASH_POD_DEFAULT), SWAP(M_SWAP_DEFAULT))
/* Default oplist for a structure defined with an array of size 1 */ /* Default oplist for a structure defined with an array of size 1 */
#define M_A1_OPLIST \ #define M_A1_OPLIST \