From d0eb2f21d3d05fc867657bb9eed906cff705a671 Mon Sep 17 00:00:00 2001
From: Evan Driscoll <evaned@gmail.com>
Date: Sun, 3 Jun 2018 22:06:27 -0500
Subject: [PATCH] Refactor: fancy_serializer passes json_pointer to stylizer

---
 .../detail/output/fancy_serializer.hpp        | 20 ++++++++++---------
 single_include/nlohmann/json.hpp              | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/include/nlohmann/detail/output/fancy_serializer.hpp b/include/nlohmann/detail/output/fancy_serializer.hpp
index e9a2b7c67..354fb2940 100644
--- a/include/nlohmann/detail/output/fancy_serializer.hpp
+++ b/include/nlohmann/detail/output/fancy_serializer.hpp
@@ -52,6 +52,7 @@ class basic_fancy_serializer_stylizer
 {
   public:
     using string_t = typename BasicJsonType::string_t;
+    using json_pointer_t = json_pointer<BasicJsonType>;
 
     basic_fancy_serializer_stylizer(fancy_serializer_style const& ds)
         : default_style(ds)
@@ -71,16 +72,20 @@ class basic_fancy_serializer_stylizer
     }
 
     const fancy_serializer_style* get_new_style_or_active(
-        const string_t& j,
+        const json_pointer_t& pointer,
         const fancy_serializer_style* active_style) const
     {
-        auto iter = key_styles.find(j);
+        if (pointer.cbegin() == pointer.cend())
+        {
+            return &get_default_style();
+        }
+        auto iter = key_styles.find(*pointer.crbegin());
         return iter == key_styles.end() ? active_style : &iter->second;
     }
 
-    fancy_serializer_style& get_or_insert_style(const string_t& j)
+    fancy_serializer_style& get_or_insert_style(const string_t& key)
     {
-        return key_styles[j];
+        return key_styles[key];
     }
 
   private:
@@ -125,7 +130,7 @@ class fancy_serializer
 
     void dump(const BasicJsonType& val, const bool ensure_ascii)
     {
-        dump(val, ensure_ascii, 0, &stylizer.get_default_style(), json_pointer_t());
+        dump(val, ensure_ascii, 0, nullptr, json_pointer_t());
     }
 
   private:
@@ -151,10 +156,7 @@ class fancy_serializer
               const fancy_serializer_style* active_style,
               const json_pointer_t& context)
     {
-        if (context.cbegin() != context.cend())
-        {
-            active_style = stylizer.get_new_style_or_active(*context.crbegin(), active_style);
-        }
+        active_style = stylizer.get_new_style_or_active(context, active_style);
 
         switch (val.m_type)
         {
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 418b36e76..99c9ae923 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -10857,6 +10857,7 @@ class basic_fancy_serializer_stylizer
 {
   public:
     using string_t = typename BasicJsonType::string_t;
+    using json_pointer_t = json_pointer<BasicJsonType>;
 
     basic_fancy_serializer_stylizer(fancy_serializer_style const& ds)
         : default_style(ds)
@@ -10876,16 +10877,20 @@ class basic_fancy_serializer_stylizer
     }
 
     const fancy_serializer_style* get_new_style_or_active(
-        const string_t& j,
+        const json_pointer_t& pointer,
         const fancy_serializer_style* active_style) const
     {
-        auto iter = key_styles.find(j);
+        if (pointer.cbegin() == pointer.cend())
+        {
+            return &get_default_style();
+        }
+        auto iter = key_styles.find(*pointer.crbegin());
         return iter == key_styles.end() ? active_style : &iter->second;
     }
 
-    fancy_serializer_style& get_or_insert_style(const string_t& j)
+    fancy_serializer_style& get_or_insert_style(const string_t& key)
     {
-        return key_styles[j];
+        return key_styles[key];
     }
 
   private:
@@ -10930,7 +10935,7 @@ class fancy_serializer
 
     void dump(const BasicJsonType& val, const bool ensure_ascii)
     {
-        dump(val, ensure_ascii, 0, &stylizer.get_default_style(), json_pointer_t());
+        dump(val, ensure_ascii, 0, nullptr, json_pointer_t());
     }
 
   private:
@@ -10956,10 +10961,7 @@ class fancy_serializer
               const fancy_serializer_style* active_style,
               const json_pointer_t& context)
     {
-        if (context.cbegin() != context.cend())
-        {
-            active_style = stylizer.get_new_style_or_active(*context.crbegin(), active_style);
-        }
+        active_style = stylizer.get_new_style_or_active(context, active_style);
 
         switch (val.m_type)
         {