github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-10-31 16:14:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add FloatTraits::highest_for()

Browse Source
This commit is contained in:
Benoit Blanchon
2022-04-06 12:32:21 +02:00
parent c65692ab31
commit e7afef895e
2 changed files with 29 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ArduinoJson/Numbers/FloatTraits.hpp
View File

@@ -116,6 +116,14 @@ struct FloatTraits<T, 8 /*64bits*/> {
return forge(0x7FEFFFFF, 0xFFFFFFFF);
}
static T highest_for(int64_t) {
return forge(0x43DFFFFF, 0xFFFFFFFF); // 9.2233720368547748e+18
}
static T highest_for(uint64_t) {
return forge(0x43EFFFFF, 0xFFFFFFFF); // 1.8446744073709549568e+19
}
static T lowest() {
return forge(0xFFEFFFFF, 0xFFFFFFFF);
}
@@ -212,6 +220,22 @@ struct FloatTraits<T, 4 /*32bits*/> {
return forge(0x7f7fffff);
}
static T highest_for(int32_t) {
return forge(0x4EFFFFFF); // 2.14748352E9
}
static T highest_for(uint32_t) {
return forge(0x4F7FFFFF); // 4.29496704E9
}
static T highest_for(int64_t) {
return forge(0x5EFFFFFF); // 9.22337148709896192E18
}
static T highest_for(uint64_t) {
return forge(0x5F7FFFFF); // 1.844674297419792384E19
}
static T lowest() {
return forge(0xFf7fffff);
}

58
src/ArduinoJson/Numbers/convertNumber.hpp
View File

@@ -109,68 +109,20 @@ canConvertNumber(TIn value) {
}
// float32 -> int32
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 4 &&
is_integral<TOut>::value && is_signed<TOut>::value &&
sizeof(TOut) == 4,
bool>::type
canConvertNumber(TIn value) {
return value >= numeric_limits<TOut>::lowest() && value <= 2.14748352e+9f;
}
// float32 -> uint32
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 4 &&
is_integral<TOut>::value && is_unsigned<TOut>::value &&
sizeof(TOut) == 4,
bool>::type
canConvertNumber(TIn value) {
return value >= numeric_limits<TOut>::lowest() && value <= 4.29496704e+9f;
}
// float32 -> int64
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 4 &&
is_integral<TOut>::value && is_signed<TOut>::value &&
sizeof(TOut) == 8,
bool>::type
canConvertNumber(TIn value) {
return value >= numeric_limits<TOut>::lowest() && value <= 9.22337149e+18f;
}
// float32 -> uint64
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 4 &&
is_integral<TOut>::value && is_unsigned<TOut>::value &&
sizeof(TOut) == 8,
bool>::type
canConvertNumber(TIn value) {
return value >= numeric_limits<TOut>::lowest() &&
value <= 1.844674297419792384e+19f;
}
// float64 -> int64
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 8 &&
is_integral<TOut>::value && is_signed<TOut>::value &&
sizeof(TOut) == 8,
bool>::type
canConvertNumber(TIn value) {
return value >= numeric_limits<TOut>::lowest() &&
value <= FloatTraits<TIn>::forge(
0x43DFFFFF, 0xFFFFFFFF); // 9.2233720368547748e+18
}
// float64 -> uint64
template <typename TOut, typename TIn>
typename enable_if<is_floating_point<TIn>::value && sizeof(TIn) == 8 &&
is_integral<TOut>::value && is_unsigned<TOut>::value &&
sizeof(TOut) == 8,
typename enable_if<is_floating_point<TIn>::value && is_integral<TOut>::value &&
sizeof(TOut) >= sizeof(TIn),
bool>::type
canConvertNumber(TIn value) {
// Avoid error "9.22337e+18 is outside the range of representable values of
// type 'long'"
return value >= numeric_limits<TOut>::lowest() &&
value <= FloatTraits<TIn>::forge(
0x43EFFFFF, 0xFFFFFFFF); // 1.8446744073709549568e+19
value <= FloatTraits<TIn>::highest_for(TOut());
}
template <typename TOut, typename TIn>