diff --git a/src/__internal/include.h b/src/__internal/include.h index 25d00e9..285e510 100644 --- a/src/__internal/include.h +++ b/src/__internal/include.h @@ -1,6 +1,8 @@ /* This software is licensed by the MIT License, see LICENSE file */ /* Copyright © 2022 Gregory Lirent */ +#include +#include #include #include @@ -32,6 +34,8 @@ #define true ((_Bool)1) #define false ((_Bool)0) +#define abs(v) _Generic((v), ldbl_t: fabsl, dbl_t: fabs, fl_t: fabsf)(v) + #include "__attributes.h" typedef vtype_uint8 u8_t; diff --git a/src/vtype-extra.c b/src/vtype-extra.c index 94d827d..8f86f91 100644 --- a/src/vtype-extra.c +++ b/src/vtype-extra.c @@ -1,7 +1,6 @@ /* This software is licensed by the MIT License, see LICENSE file */ /* Copyright © 2022 Gregory Lirent */ -#include #include #include "__internal/include.h" @@ -16,9 +15,9 @@ unsigned int: "%u", signed int: "%d",\ unsigned long: "%lu", signed long: "%ld",\ unsigned long long: "%llu", signed long long: "%lld",\ - float: "%."s__(FLT_DECIMAL_DIG)"g",\ + float: "%."s__(FLT_DIG)"g",\ double: "%."s__(DBL_DIG)"lg",\ - long double: "%."s__(DBL_DECIMAL_DIG)"Lg") + long double: "%."s__(LDBL_DIG)"Lg") #define stringify(v) sprintf(STRINGIFY_BUFFER, fstring(v), (v)) @@ -78,10 +77,21 @@ const char* libcdsb_vtype_stringify(const void* v, vtype t) { case VTYPE_UINT16: stringify(*( u16_t*)v); break; case VTYPE_UINT32: stringify(*( u32_t*)v); break; case VTYPE_UINT64: stringify(*( u64_t*)v); break; - case VTYPE_FLOAT: stringify(*( fl_t*)v); break; - case VTYPE_DOUBLE: stringify(*( dbl_t*)v); break; - case VTYPE_LDOUBLE: stringify(*(ldbl_t*)v); break; - + case VTYPE_FLOAT: if (abs(*(fl_t*)v) <= FLT_EPSILON) { + STRINGIFY_BUFFER[0] = 0x30; + STRINGIFY_BUFFER[1] = 0x00; + } else stringify(*(fl_t*)v); + break; + case VTYPE_DOUBLE: if (abs(*(dbl_t*)v) <= DBL_EPSILON) { + STRINGIFY_BUFFER[0] = 0x30; + STRINGIFY_BUFFER[1] = 0x00; + } else stringify(*(dbl_t*)v); + break; + case VTYPE_LDOUBLE: if (abs(*(ldbl_t*)v) <= LDBL_EPSILON) { + STRINGIFY_BUFFER[0] = 0x30; + STRINGIFY_BUFFER[1] = 0x00; + } else stringify(*(ldbl_t*)v); + break; case VTYPE_POINTER: sprintf(STRINGIFY_BUFFER, (sizeof(void*) == 8) ? "0x%016lx" : "0x%08x", (uintptr_t)*(void**)v); break; default: sprintf(STRINGIFY_BUFFER, "<%s>", libcdsb_vtype_name(t)); diff --git a/src/vtype.c b/src/vtype.c index d7b6a9f..266ecda 100644 --- a/src/vtype.c +++ b/src/vtype.c @@ -4,73 +4,45 @@ #include "__internal/assert.h" #include "__internal/include.h" -#define max_align _Alignof(max_align_t) -#define max_size ((sizeof(ldbl_t) >= 8) ? sizeof(ldbl_t) : 8) - /*#####################################################################################################################*/ -static vtype normalize_value(u64_t* d, const void* v, vtype t) { +static ldbl_t normalize_value(const void* v, vtype t) { if (t == VTYPE_BOOLEAN || t == VTYPE_UINT8) { - *d = *(u8_t*)v; - t = VTYPE_UINT64; + return *(u8_t*)v; } else if (t == VTYPE_UINT16) { - *d = *(u16_t*)v; - t = VTYPE_UINT64; + return *(u16_t*)v; } else if (t == VTYPE_UINT32 || (sizeof(void*) == 4 && t == VTYPE_POINTER)) { - *d = *(u32_t*)v; - t = VTYPE_UINT64; + return *(u32_t*)v; } else if (t == VTYPE_UINT64 || (sizeof(void*) == 8 && t == VTYPE_POINTER)) { - *d = *(u64_t*)v; - t = VTYPE_UINT64; + return *(u64_t*)v; } else if (t == VTYPE_INT8) { - *d = *(s8_t*)v; - t = (*(s8_t*)v >= 0) ? VTYPE_UINT64 : VTYPE_INT64; + return *(s8_t*)v; } else if (t == VTYPE_INT16) { - *d = *(s16_t*)v; - t = (*(s16_t*)v >= 0) ? VTYPE_UINT64 : VTYPE_INT64; + return *(s16_t*)v; } else if (t == VTYPE_INT32) { - *d = *(s32_t*)v; - t = (*(s32_t*)v >= 0) ? VTYPE_UINT64 : VTYPE_INT64; + return *(s32_t*)v; } else if (t == VTYPE_INT64) { - *d = *(s64_t*)v; - t = (*(s64_t*)v >= 0) ? VTYPE_UINT64 : VTYPE_INT64; - } - - return t; + return *(s64_t*)v; + } else if (t == VTYPE_FLOAT) { + return abs(*(fl_t*)v) <= FLT_EPSILON ? 0 : *(fl_t*)v; + } else if (t == VTYPE_DOUBLE) { + return abs(*(dbl_t*)v) <= DBL_EPSILON ? 0 : *(dbl_t*)v; + } else return abs(*(ldbl_t*)v) <= LDBL_EPSILON ? 0 : *(ldbl_t*)v; } int libcdsb_vtype_compare_values(const void* s0, vtype t0, const void* s1, vtype t1) { if (t0 == t1) return libcdsb_vtype_compare_values_eq(s0, s1, t0); - if (is_integer(t0) && is_integer(t1)) { - u64_t v0, v1; + if (t0 <= VTYPE_LDOUBLE && t1 <= VTYPE_LDOUBLE) { + ldbl_t d0, d1; - t0 = normalize_value(&v0, s0, t0); - t1 = normalize_value(&v1, s1, t1); + d0 = normalize_value(s0, t0); + d1 = normalize_value(s1, t1); - if (t0 == t1) { - if (t0 > VTYPE_UINT64) - return (s64_t)v0 - (s64_t)v1; - return v0 - v1; - } + return (abs(d0 - d1) <= LDBL_EPSILON) ? 0 : (d0 < d1 ? -1 : 1); + } - return t1 - t0; - - } else if (is_float(t0) && is_float(t1)) { - ldbl_t v; - - if (t0 == VTYPE_FLOAT) v = *(fl_t*)s0; - else if (t0 == VTYPE_DOUBLE) v = *(dbl_t*)s0; - else v = *(ldbl_t*)s0; - - if (t1 == VTYPE_FLOAT) v -= *(fl_t*)s1; - else if (t1 == VTYPE_DOUBLE) v -= *(dbl_t*)s1; - else v -= *(ldbl_t*)s1; - - if (v < 0) return -1; - - return (v > 0) ? 1 : 0; - } else return t0 - t1; + return t0 - t1; } /*#####################################################################################################################*/ @@ -78,45 +50,30 @@ int libcdsb_vtype_compare_values(const void* s0, vtype t0, const void* s1, vtype int libcdsb_vtype_compare_values_eq(const void* s0, const void* s1, vtype t) { - ldbl_t v[1]; + #define compare(T, s0, s1) *(T*)s0 == *(T*)s1 ? 0 : (*(T*)s0 < *(T*)s1 ? -1 : 1) if (s0 == s1) return 0; switch (t) { default: abort(); - case VTYPE_INT8: return *(s8_t*)s0 - *(s8_t*)s1; - case VTYPE_INT16: return *(s16_t*)s0 - *(s16_t*)s1; - case VTYPE_INT32: return *(s32_t*)s0 - *(s32_t*)s1; - case VTYPE_INT64: return *(s64_t*)s0 - *(s64_t*)s1; + case VTYPE_INT8: return compare( s8_t, s0, s1); + case VTYPE_INT16: return compare(s16_t, s0, s1); + case VTYPE_INT32: return compare(s32_t, s0, s1); + case VTYPE_INT64: return compare(s64_t, s0, s1); case VTYPE_BOOLEAN: - case VTYPE_UINT8: return *(u8_t*)s0 - *(u8_t*)s1; - - case VTYPE_UINT16: return *(u16_t*)s0 - *(u16_t*)s1; + case VTYPE_UINT8: return compare( u8_t, s0, s1); + case VTYPE_UINT16: return compare(u16_t, s0, s1); case VTYPE_UINT32: - u32_: return *(u32_t*)s0 - *(u32_t*)s1; + u32_: return compare(u32_t, s0, s1); case VTYPE_POINTER: if (sizeof(void*) != 8) goto u32_; - case VTYPE_UINT64: return *(u64_t*)s0 - *(u64_t*)s1; + case VTYPE_UINT64: return compare(u64_t, s0, s1); - case VTYPE_LDOUBLE: *(ldbl_t*)v = *(ldbl_t*)s0 - *(ldbl_t*)s1; - - if (!*(ldbl_t*)v) - return 0; - return *(ldbl_t*)v < 0 ? -1 : 1; - - case VTYPE_DOUBLE: *(dbl_t*)v = *(dbl_t*)s0 - *(dbl_t*)s1; - - if (!*(dbl_t*)v) - return 0; - return *(dbl_t*)v < 0 ? -1 : 1; - - case VTYPE_FLOAT: *(fl_t*)v = *(fl_t*)s0 - *(fl_t*)s1; - - if (!*(fl_t*)v) - return 0; - return *(fl_t*)v < 0 ? -1 : 1; + case VTYPE_LDOUBLE: return (abs(*(ldbl_t*)s0 - *(ldbl_t*)s1) <= LDBL_EPSILON) ? 0 : (*(ldbl_t*)s0 < *(ldbl_t*)s1 ? -1 : 1); + case VTYPE_DOUBLE: return (abs(*( dbl_t*)s0 - *( dbl_t*)s1) <= DBL_EPSILON) ? 0 : (*( dbl_t*)s0 < *( dbl_t*)s1 ? -1 : 1); + case VTYPE_FLOAT: return (abs(*( fl_t*)s0 - *( fl_t*)s1) <= FLT_EPSILON) ? 0 : (*( fl_t*)s0 < *( fl_t*)s1 ? -1 : 1); case VTYPE_STRING: return string_compare(s0, s1); case VTYPE_ARRAY: return array_compare(s0, s1); @@ -124,4 +81,6 @@ int libcdsb_vtype_compare_values_eq(const void* s0, const void* s1, vtype t) { case VTYPE_MAP: return map_compare(s0, s1); case VTYPE_SET: return vset_compare(s0, s1); } + + #undef compare }