From b1eb273d5b4f9392f9124723c087b9d35611ce23 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Tue, 23 Feb 2021 08:33:28 +0100
Subject: [PATCH] Added JsonVariant::is<JsonArrayConst/JsonObjectConst>()
 (issue #1412)

---
 CHANGELOG.md                           |  1 +
 extras/tests/JsonVariant/is.cpp        |  8 ++++++++
 src/ArduinoJson/Variant/VariantRef.hpp | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e42b15bf..4a45e689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ HEAD
 * `deserializeJson()` leaves `\uXXXX` unchanged instead of returning `NotSupported`
 * `deserializeMsgPack()` inserts `null` instead of returning `NotSupported`
 * Removed `DeserializationError::NotSupported`
+* Added `JsonVariant::is<JsonArrayConst/JsonObjectConst>()` (issue #1412)
 
 > ### BREAKING CHANGES
 >
diff --git a/extras/tests/JsonVariant/is.cpp b/extras/tests/JsonVariant/is.cpp
index 7e94ad20..c7383455 100644
--- a/extras/tests/JsonVariant/is.cpp
+++ b/extras/tests/JsonVariant/is.cpp
@@ -97,7 +97,9 @@ TEST_CASE("JsonVariant::is<T>()") {
     variant.to<JsonArray>();
 
     CHECK(variant.is<JsonArray>() == true);
+    CHECK(variant.is<JsonArrayConst>() == true);
     CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonObjectConst>() == false);
     CHECK(variant.is<int>() == false);
     CHECK(variant.is<float>() == false);
     CHECK(variant.is<bool>() == false);
@@ -109,7 +111,9 @@ TEST_CASE("JsonVariant::is<T>()") {
     variant.to<JsonObject>();
 
     CHECK(variant.is<JsonObject>() == true);
+    CHECK(variant.is<JsonObjectConst>() == true);
     CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<JsonArrayConst>() == false);
     CHECK(variant.is<int>() == false);
     CHECK(variant.is<float>() == false);
     CHECK(variant.is<bool>() == false);
@@ -209,7 +213,9 @@ TEST_CASE("JsonVariantConst::is<T>()") {
     variant.to<JsonArray>();
 
     CHECK(cvariant.is<JsonArray>() == true);
+    CHECK(cvariant.is<JsonArrayConst>() == true);
     CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonObjectConst>() == false);
     CHECK(cvariant.is<int>() == false);
     CHECK(cvariant.is<float>() == false);
     CHECK(cvariant.is<bool>() == false);
@@ -221,7 +227,9 @@ TEST_CASE("JsonVariantConst::is<T>()") {
     variant.to<JsonObject>();
 
     CHECK(cvariant.is<JsonObject>() == true);
+    CHECK(cvariant.is<JsonObjectConst>() == true);
     CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonArrayConst>() == false);
     CHECK(cvariant.is<int>() == false);
     CHECK(cvariant.is<float>() == false);
     CHECK(cvariant.is<bool>() == false);
diff --git a/src/ArduinoJson/Variant/VariantRef.hpp b/src/ArduinoJson/Variant/VariantRef.hpp
index 68a37d44..e2d6e7dc 100644
--- a/src/ArduinoJson/Variant/VariantRef.hpp
+++ b/src/ArduinoJson/Variant/VariantRef.hpp
@@ -85,6 +85,15 @@ class VariantRefBase : public VariantTag {
     return variantIsArray(_data);
   }
   //
+  // bool is<ArrayConstRef> const;
+  // bool is<const ArrayConstRef> const;
+  template <typename T>
+  FORCE_INLINE typename enable_if<
+      is_same<typename remove_const<T>::type, ArrayConstRef>::value, bool>::type
+  is() const {
+    return variantIsArray(_data);
+  }
+  //
   // bool is<ObjectRef> const;
   // bool is<const ObjectRef> const;
   template <typename T>
@@ -93,6 +102,16 @@ class VariantRefBase : public VariantTag {
   is() const {
     return variantIsObject(_data);
   }
+  //
+  // bool is<ObjectConstRef> const;
+  // bool is<const ObjectConstRef> const;
+  template <typename T>
+  FORCE_INLINE typename enable_if<
+      is_same<typename remove_const<T>::type, ObjectConstRef>::value,
+      bool>::type
+  is() const {
+    return variantIsObject(_data);
+  }
 #if ARDUINOJSON_HAS_NULLPTR
   //
   // bool is<nullptr_t> const;