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

Rename UInt to JsonUInt

Browse Source
This commit is contained in:
Benoit Blanchon
2022-12-19 12:14:16 +01:00
parent 652d70fe2c
commit d0b619ea93
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/tests/Misc/TypeTraits.cpp
View File

@@ -80,7 +80,7 @@ TEST_CASE("Polyfills/type_traits") {
CHECK(is_integral<const volatile unsigned long>::value == true); CHECK(is_integral<const volatile unsigned long>::value == true);
CHECK(is_integral<const volatile unsigned short>::value == true); CHECK(is_integral<const volatile unsigned short>::value == true);
CHECK(is_integral<UInt>::value == true); CHECK(is_integral<JsonUInt>::value == true);
} }
SECTION("is_signed") { SECTION("is_signed") {

2
src/ArduinoJson.hpp
View File

@@ -56,7 +56,7 @@ using ARDUINOJSON_NAMESPACE::JsonObjectConst;
using ARDUINOJSON_NAMESPACE::JsonPair; using ARDUINOJSON_NAMESPACE::JsonPair;
using ARDUINOJSON_NAMESPACE::JsonPairConst; using ARDUINOJSON_NAMESPACE::JsonPairConst;
typedef ARDUINOJSON_NAMESPACE::String JsonString; typedef ARDUINOJSON_NAMESPACE::String JsonString;
typedef ARDUINOJSON_NAMESPACE::UInt JsonUInt; using ARDUINOJSON_NAMESPACE::JsonUInt;
typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst; typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst;
typedef ARDUINOJSON_NAMESPACE::VariantRef JsonVariant; typedef ARDUINOJSON_NAMESPACE::VariantRef JsonVariant;
using ARDUINOJSON_NAMESPACE::BasicJsonDocument; using ARDUINOJSON_NAMESPACE::BasicJsonDocument;

2
src/ArduinoJson/Json/JsonSerializer.hpp
View File

@@ -83,7 +83,7 @@ class JsonSerializer : public Visitor<size_t> {
return bytesWritten(); return bytesWritten();
} }
size_t visitUnsignedInteger(UInt value) { size_t visitUnsignedInteger(JsonUInt value) {
_formatter.writeInteger(value); _formatter.writeInteger(value);
return bytesWritten(); return bytesWritten();
} }

4
src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
View File

@@ -109,7 +109,7 @@ class MsgPackSerializer : public Visitor<size_t> {
size_t visitSignedInteger(JsonInteger value) { size_t visitSignedInteger(JsonInteger value) {
if (value > 0) { if (value > 0) {
visitUnsignedInteger(static_cast<UInt>(value)); visitUnsignedInteger(static_cast<JsonUInt>(value));
} else if (value >= -0x20) { } else if (value >= -0x20) {
writeInteger(int8_t(value)); writeInteger(int8_t(value));
} else if (value >= -0x80) { } else if (value >= -0x80) {
@@ -137,7 +137,7 @@ class MsgPackSerializer : public Visitor<size_t> {
return bytesWritten(); return bytesWritten();
} }
size_t visitUnsignedInteger(UInt value) { size_t visitUnsignedInteger(JsonUInt value) {
if (value <= 0x7F) { if (value <= 0x7F) {
writeInteger(uint8_t(value)); writeInteger(uint8_t(value));
} else if (value <= 0xFF) { } else if (value <= 0xFF) {

4
src/ArduinoJson/Numbers/JsonInteger.hpp
View File

@@ -13,10 +13,10 @@ namespace ARDUINOJSON_NAMESPACE {
#if ARDUINOJSON_USE_LONG_LONG #if ARDUINOJSON_USE_LONG_LONG
typedef int64_t JsonInteger; typedef int64_t JsonInteger;
typedef uint64_t UInt; typedef uint64_t JsonUInt;
#else #else
typedef long JsonInteger; typedef long JsonInteger;
typedef unsigned long UInt; typedef unsigned long JsonUInt;
#endif #endif
} // namespace ARDUINOJSON_NAMESPACE } // namespace ARDUINOJSON_NAMESPACE

10
src/ArduinoJson/Numbers/arithmeticCompare.hpp
View File

@@ -90,13 +90,14 @@ CompareResult arithmeticCompare(
template <typename T2> template <typename T2>
CompareResult arithmeticCompareNegateLeft( CompareResult arithmeticCompareNegateLeft(
UInt, const T2&, typename enable_if<is_unsigned<T2>::value>::type* = 0) { JsonUInt, const T2&,
typename enable_if<is_unsigned<T2>::value>::type* = 0) {
return COMPARE_RESULT_LESS; return COMPARE_RESULT_LESS;
} }
template <typename T2> template <typename T2>
CompareResult arithmeticCompareNegateLeft( CompareResult arithmeticCompareNegateLeft(
UInt lhs, const T2& rhs, JsonUInt lhs, const T2& rhs,
typename enable_if<is_signed<T2>::value>::type* = 0) { typename enable_if<is_signed<T2>::value>::type* = 0) {
if (rhs > 0) if (rhs > 0)
return COMPARE_RESULT_LESS; return COMPARE_RESULT_LESS;
@@ -105,13 +106,14 @@ CompareResult arithmeticCompareNegateLeft(
template <typename T1> template <typename T1>
CompareResult arithmeticCompareNegateRight( CompareResult arithmeticCompareNegateRight(
const T1&, UInt, typename enable_if<is_unsigned<T1>::value>::type* = 0) { const T1&, JsonUInt,
typename enable_if<is_unsigned<T1>::value>::type* = 0) {
return COMPARE_RESULT_GREATER; return COMPARE_RESULT_GREATER;
} }
template <typename T1> template <typename T1>
CompareResult arithmeticCompareNegateRight( CompareResult arithmeticCompareNegateRight(
const T1& lhs, UInt rhs, const T1& lhs, JsonUInt rhs,
typename enable_if<is_signed<T1>::value>::type* = 0) { typename enable_if<is_signed<T1>::value>::type* = 0) {
if (lhs > 0) if (lhs > 0)
return COMPARE_RESULT_GREATER; return COMPARE_RESULT_GREATER;

6
src/ArduinoJson/Numbers/parseNumber.hpp
View File

@@ -20,7 +20,7 @@ struct choose_largest : conditional<(sizeof(A) > sizeof(B)), A, B> {};
inline bool parseNumber(const char* s, VariantData& result) { inline bool parseNumber(const char* s, VariantData& result) {
typedef FloatTraits<JsonFloat> traits; typedef FloatTraits<JsonFloat> traits;
typedef choose_largest<traits::mantissa_type, UInt>::type mantissa_t; typedef choose_largest<traits::mantissa_type, JsonUInt>::type mantissa_t;
typedef traits::exponent_type exponent_t; typedef traits::exponent_type exponent_t;
ARDUINOJSON_ASSERT(s != 0); ARDUINOJSON_ASSERT(s != 0);
@@ -55,7 +55,7 @@ inline bool parseNumber(const char* s, VariantData& result) {
mantissa_t mantissa = 0; mantissa_t mantissa = 0;
exponent_t exponent_offset = 0; exponent_t exponent_offset = 0;
const mantissa_t maxUint = UInt(-1); const mantissa_t maxUint = JsonUInt(-1);
while (isdigit(*s)) { while (isdigit(*s)) {
uint8_t digit = uint8_t(*s - '0'); uint8_t digit = uint8_t(*s - '0');
@@ -77,7 +77,7 @@ inline bool parseNumber(const char* s, VariantData& result) {
return true; return true;
} }
} else { } else {
result.setInteger(UInt(mantissa)); result.setInteger(JsonUInt(mantissa));
return true; return true;
} }
} }

8
src/ArduinoJson/Variant/VariantCompare.hpp
View File

@@ -60,12 +60,12 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
return arithmeticCompare(lhs, rhs); return arithmeticCompare(lhs, rhs);
} }
CompareResult visitUnsignedInteger(UInt lhs) { CompareResult visitUnsignedInteger(JsonUInt lhs) {
return arithmeticCompare(lhs, rhs); return arithmeticCompare(lhs, rhs);
} }
CompareResult visitBoolean(bool lhs) { CompareResult visitBoolean(bool lhs) {
return visitUnsignedInteger(static_cast<UInt>(lhs)); return visitUnsignedInteger(static_cast<JsonUInt>(lhs));
} }
}; };
@@ -162,8 +162,8 @@ struct VariantComparer : ComparerBase {
return accept(comparer); return accept(comparer);
} }
CompareResult visitUnsignedInteger(UInt lhs) { CompareResult visitUnsignedInteger(JsonUInt lhs) {
Comparer<UInt> comparer(lhs); Comparer<JsonUInt> comparer(lhs);
return accept(comparer); return accept(comparer);
} }

2
src/ArduinoJson/Variant/VariantContent.hpp
View File

@@ -46,7 +46,7 @@ struct RawData {
union VariantContent { union VariantContent {
JsonFloat asFloat; JsonFloat asFloat;
bool asBoolean; bool asBoolean;
UInt asUnsignedInteger; JsonUInt asUnsignedInteger;
JsonInteger asSignedInteger; JsonInteger asSignedInteger;
CollectionData asCollection; CollectionData asCollection;
struct { struct {

2
src/ArduinoJson/Variant/VariantData.hpp
View File

@@ -204,7 +204,7 @@ class VariantData {
template <typename T> template <typename T>
typename enable_if<is_unsigned<T>::value>::type setInteger(T value) { typename enable_if<is_unsigned<T>::value>::type setInteger(T value) {
setType(VALUE_IS_UNSIGNED_INTEGER); setType(VALUE_IS_UNSIGNED_INTEGER);
_content.asUnsignedInteger = static_cast<UInt>(value); _content.asUnsignedInteger = static_cast<JsonUInt>(value);
} }
template <typename T> template <typename T>

2
src/ArduinoJson/Variant/Visitor.hpp
View File

@@ -38,7 +38,7 @@ struct Visitor {
return TResult(); return TResult();
} }
TResult visitUnsignedInteger(UInt) { TResult visitUnsignedInteger(JsonUInt) {
return TResult(); return TResult();
} }