From 7b7ee6cdebaf09a9cc3ef8c4ef886d85b58777a3 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Fri, 11 Jul 2025 14:32:30 +0200
Subject: [PATCH] Add `VariantImpl::isUnbound()`

---
 src/ArduinoJson/Deserialization/deserialize.hpp | 2 +-
 src/ArduinoJson/Variant/ConverterImpl.hpp       | 2 +-
 src/ArduinoJson/Variant/JsonVariant.hpp         | 6 ++----
 src/ArduinoJson/Variant/JsonVariantConst.hpp    | 2 +-
 src/ArduinoJson/Variant/VariantImpl.hpp         | 4 ++++
 src/ArduinoJson/Variant/VariantRefBase.hpp      | 2 +-
 src/ArduinoJson/Variant/VariantRefBaseImpl.hpp  | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/ArduinoJson/Deserialization/deserialize.hpp b/src/ArduinoJson/Deserialization/deserialize.hpp
index 640d4d0d..542c5cc2 100644
--- a/src/ArduinoJson/Deserialization/deserialize.hpp
+++ b/src/ArduinoJson/Deserialization/deserialize.hpp
@@ -45,7 +45,7 @@ template <template <typename> class TDeserializer, typename TDestination,
 DeserializationError doDeserialize(TDestination&& dst, TReader reader,
                                    TOptions options) {
   auto impl = VariantAttorney::getOrCreateImpl(dst);
-  if (impl.getData() == nullptr)
+  if (impl.isUnbound())
     return DeserializationError::NoMemory;
   auto resources = impl.getResourceManager();
   dst.clear();
diff --git a/src/ArduinoJson/Variant/ConverterImpl.hpp b/src/ArduinoJson/Variant/ConverterImpl.hpp
index 677c5fd1..2dba4084 100644
--- a/src/ArduinoJson/Variant/ConverterImpl.hpp
+++ b/src/ArduinoJson/Variant/ConverterImpl.hpp
@@ -232,7 +232,7 @@ class StringBuilderPrint : public Print {
 
 inline void convertToJson(const ::Printable& src, JsonVariant dst) {
   auto impl = detail::VariantAttorney::getImpl(dst);
-  if (!impl.getData())
+  if (impl.isUnbound())
     return;
   impl.clear();
   detail::StringBuilderPrint print(impl.getResourceManager());
diff --git a/src/ArduinoJson/Variant/JsonVariant.hpp b/src/ArduinoJson/Variant/JsonVariant.hpp
index 4c0f668d..e8e6910a 100644
--- a/src/ArduinoJson/Variant/JsonVariant.hpp
+++ b/src/ArduinoJson/Variant/JsonVariant.hpp
@@ -52,8 +52,7 @@ struct Converter<JsonVariant> : private detail::VariantAttorney {
   }
 
   static bool checkJson(JsonVariant src) {
-    auto data = getImpl(src).getData();
-    return !!data;
+    return !getImpl(src).isUnbound();
   }
 };
 
@@ -68,8 +67,7 @@ struct Converter<JsonVariantConst> : private detail::VariantAttorney {
   }
 
   static bool checkJson(JsonVariantConst src) {
-    auto data = getImpl(src).getData();
-    return !!data;
+    return !getImpl(src).isUnbound();
   }
 };
 
diff --git a/src/ArduinoJson/Variant/JsonVariantConst.hpp b/src/ArduinoJson/Variant/JsonVariantConst.hpp
index 02f4f91a..deb202d4 100644
--- a/src/ArduinoJson/Variant/JsonVariantConst.hpp
+++ b/src/ArduinoJson/Variant/JsonVariantConst.hpp
@@ -53,7 +53,7 @@ class JsonVariantConst : public detail::VariantTag,
 
   // Returns true if the reference is unbound.
   bool isUnbound() const {
-    return impl_.getData() == nullptr;
+    return impl_.isUnbound();
   }
 
   // Returns the depth (nesting level) of the value.
diff --git a/src/ArduinoJson/Variant/VariantImpl.hpp b/src/ArduinoJson/Variant/VariantImpl.hpp
index f269b77a..fd3b0d38 100644
--- a/src/ArduinoJson/Variant/VariantImpl.hpp
+++ b/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -319,6 +319,10 @@ class VariantImpl {
     }
   }
 
+  bool isUnbound() const {
+    return !data_;
+  }
+
   bool isNull() const {
     return type() == VariantType::Null;
   }
diff --git a/src/ArduinoJson/Variant/VariantRefBase.hpp b/src/ArduinoJson/Variant/VariantRefBase.hpp
index b2ddd1df..5eef658a 100644
--- a/src/ArduinoJson/Variant/VariantRefBase.hpp
+++ b/src/ArduinoJson/Variant/VariantRefBase.hpp
@@ -40,7 +40,7 @@ class VariantRefBase : public VariantTag {
 
   // Returns true if the reference is unbound.
   bool isUnbound() const {
-    return !getImpl().getData();
+    return getImpl().isUnbound();
   }
 
   // Casts the value to the specified type.
diff --git a/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp b/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
index 958dacef..51396493 100644
--- a/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
+++ b/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
@@ -145,7 +145,7 @@ template <typename TDerived>
 template <typename T, enable_if_t<is_same<T, JsonArray>::value, int>>
 inline JsonArray VariantRefBase<TDerived>::to() const {
   auto impl = getOrCreateImpl();
-  if (!impl.getData())
+  if (impl.isUnbound())
     return JsonArray();
   impl.clear();
   impl.getData()->toArray();
@@ -156,7 +156,7 @@ template <typename TDerived>
 template <typename T, enable_if_t<is_same<T, JsonObject>::value, int>>
 JsonObject VariantRefBase<TDerived>::to() const {
   auto impl = getOrCreateImpl();
-  if (!impl.getData())
+  if (impl.isUnbound())
     return JsonObject();
   impl.clear();
   impl.getData()->toObject();