ran amalgamate

Signed-off-by: Caillin Nugent <caillinn@student.unimelb.edu.au>

Author: nugentcaillin

include/nlohmann/detail/macro_scope.hpp

@@ -272,8 +272,8 @@
         {                                                                                       \
             return ej_pair.first == e;                                                          \
         });                                                                                     \
-	if (it != std::end(m)) j = it->second;                                                  \
-	else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
+        if (it != std::end(m)) j = it->second;                                                  \
+        else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
     }                                                                                           \
     template<typename BasicJsonType>                                                            \
     inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
@@ -287,8 +287,8 @@
         {                                                                                       \
             return ej_pair.second == j;                                                         \
         });                                                                                     \
-	if (it != std::end(m)) e = it->first;                                                   \
-	else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
+        if (it != std::end(m)) e = it->first;                                                   \
+        else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
     }
 
 

single_include/nlohmann/json.hpp

@@ -2617,6 +2617,45 @@ JSON_HEDLEY_DIAGNOSTIC_POP
         e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
     }
 
+/*!
+@brief macro to briefly define a mapping between an enum and JSON with exception
+       on invalid input
+@def NLOHMANN_JSON_SERIALIZE_ENUM_STRICT
+@since version 3.12.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM_STRICT(ENUM_TYPE, ...)                                     \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        if (it != std::end(m)) j = it->second;                                                  \
+        else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        if (it != std::end(m)) e = it->first;                                                   \
+        else throw nlohmann::detail::out_of_range::create(403, "enum value out of range", nullptr);\
+    }
+
+
 // Ugly macros to avoid uglier copy-paste when specializing basic_json. They
 // may be removed in the future once the class is split.