Skip to content

Commit

Permalink
Reduce code size
Browse files Browse the repository at this point in the history
  • Loading branch information
bblanchon committed Feb 27, 2025
1 parent 67dd312 commit cb1dcfa
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ HEAD
----

* Fix conversion from static string to number
* Slightly reduce code size

v7.3.0 (2024-12-29)
------
Expand Down
22 changes: 17 additions & 5 deletions src/ArduinoJson/Variant/VariantData.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ class VariantData {
#else
(void)resources; // silence warning
#endif
const char* str = nullptr;
switch (type_) {
case VariantType::Boolean:
return static_cast<T>(content_.asBoolean);
Expand All @@ -199,18 +200,23 @@ class VariantData {
return static_cast<T>(extension->asInt64);
#endif
case VariantType::LinkedString:
return parseNumber<T>(content_.asLinkedString);
str = content_.asLinkedString;
break;
case VariantType::OwnedString:
return parseNumber<T>(content_.asOwnedString->data);
str = content_.asOwnedString->data;
break;
case VariantType::Float:
return static_cast<T>(content_.asFloat);
#if ARDUINOJSON_USE_DOUBLE
case VariantType::Double:
return static_cast<T>(extension->asDouble);
#endif
default:
return 0;
return 0.0;
}

ARDUINOJSON_ASSERT(str != nullptr);
return parseNumber<T>(str);
}

template <typename T>
Expand All @@ -221,6 +227,7 @@ class VariantData {
#else
(void)resources; // silence warning
#endif
const char* str = nullptr;
switch (type_) {
case VariantType::Boolean:
return content_.asBoolean;
Expand All @@ -235,9 +242,11 @@ class VariantData {
return convertNumber<T>(extension->asInt64);
#endif
case VariantType::LinkedString:
return parseNumber<T>(content_.asLinkedString);
str = content_.asLinkedString;
break;
case VariantType::OwnedString:
return parseNumber<T>(content_.asOwnedString->data);
str = content_.asOwnedString->data;
break;
case VariantType::Float:
return convertNumber<T>(content_.asFloat);
#if ARDUINOJSON_USE_DOUBLE
Expand All @@ -247,6 +256,9 @@ class VariantData {
default:
return 0;
}

ARDUINOJSON_ASSERT(str != nullptr);
return parseNumber<T>(str);
}

ObjectData* asObject() {
Expand Down

0 comments on commit cb1dcfa

Please sign in to comment.