From 1eead99b5651d30c80607d51229d472c01ee1c40 Mon Sep 17 00:00:00 2001
From: Daniel Parker <danielaparker@yahoo.com>
Date: Wed, 8 Nov 2023 12:54:27 -0500
Subject: [PATCH] basic_json_location

---
 include/jsoncons_ext/jsonpath/expression.hpp  | 12 +++++------
 .../jsoncons_ext/jsonpath/json_location.hpp   | 20 ++++++++++---------
 .../jsonpath/jsonpath_expression.hpp          |  6 +++---
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
index 3170c7c3d3..e8e59760a7 100644
--- a/include/jsoncons_ext/jsonpath/expression.hpp
+++ b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -2070,7 +2070,7 @@ namespace detail {
         using reference = JsonReference;
         using value_pointer = typename std::conditional<std::is_const<typename std::remove_reference<JsonReference>::type>::value,typename Json::const_pointer,typename Json::pointer>::type;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,typename Json::allocator_type>;
         using path_pointer = const path_node_type*;
 
         json_location_type path_;
@@ -2131,7 +2131,7 @@ namespace detail {
         using reference = JsonReference;
         using value_pointer = typename std::conditional<std::is_const<typename std::remove_reference<JsonReference>::type>::value,typename Json::const_pointer,typename Json::pointer>::type;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,typename Json::allocator_type>;
         using path_pointer = const path_node_type*;
     private:
         const path_node_type* last_ptr_;
@@ -2177,7 +2177,7 @@ namespace detail {
         using char_type = typename Json::char_type;
         using string_type = typename Json::string_type;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,allocator_type>;
         using path_value_pair_type = path_value_pair<Json,JsonReference>;
 
         allocator_type alloc_;
@@ -2320,7 +2320,7 @@ namespace detail {
         using pointer = typename std::conditional<std::is_const<typename std::remove_reference<JsonReference>::type>::value,typename Json::const_pointer,typename Json::pointer>::type;
         using path_value_pair_type = path_value_pair<Json,JsonReference>;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,typename Json::allocator_type>;
         using node_receiver_type = node_receiver<Json,JsonReference>;
         using selector_type = jsonpath_selector<Json,JsonReference>;
 
@@ -3005,7 +3005,7 @@ namespace detail {
         using char_type = typename Json::char_type;
         using string_type = typename Json::string_type;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,typename Json::allocator_type>;
     private:
         allocator_type alloc_;
         Callback& callback_;
@@ -3041,7 +3041,7 @@ namespace detail {
         using reference_arg_type = typename std::conditional<std::is_const<typename std::remove_reference<JsonReference>::type>::value,
             const_reference_arg_t,reference_arg_t>::type;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,allocator_type>;
         using selector_type = jsonpath_selector<Json,JsonReference>;
     private:
         allocator_type alloc_;
diff --git a/include/jsoncons_ext/jsonpath/json_location.hpp b/include/jsoncons_ext/jsonpath/json_location.hpp
index b8f56f9eec..07bdd089cb 100644
--- a/include/jsoncons_ext/jsonpath/json_location.hpp
+++ b/include/jsoncons_ext/jsonpath/json_location.hpp
@@ -20,7 +20,7 @@
 namespace jsoncons { 
 namespace jsonpath {
 
-    template <class Json>
+    template <class CharT,class Allocator>
     class basic_json_location; 
 
     enum class path_node_kind { root, index, name };
@@ -28,7 +28,7 @@ namespace jsonpath {
     template <class CharT>
     class path_node 
     {
-        template<class Json> friend class basic_json_location;
+        template <class Ch,class Allocator> friend class basic_json_location;
     public:
         using string_view_type = jsoncons::basic_string_view<CharT>;
         using char_type = CharT;
@@ -316,13 +316,15 @@ namespace jsonpath {
 
     } // namespace detail
 
-    template <class Json>
+    template <class CharT, class Allocator = std::allocator<char>>
     class basic_json_location
     {
     public:
-        using allocator_type = typename Json::allocator_type;
-        using string_type = typename Json::string_type;
-        using path_node_type = path_node<typename Json::char_type>;
+        using char_type = CharT;
+        using allocator_type = Allocator;
+        using char_allocator_type = typename std::allocator_traits<allocator_type>:: template rebind_alloc<char_type>;
+        using string_type = std::basic_string<char_type,std::char_traits<char_type>,char_allocator_type>;
+        using path_node_type = path_node<char_type>;
     private:
         allocator_type alloc_;
         std::vector<const path_node_type*> nodes_;
@@ -454,7 +456,7 @@ namespace jsonpath {
     };
 
     template <class Json>
-    Json* select(Json& root, const basic_json_location<typename std::remove_cv<Json>::type>& path)
+    Json* select(Json& root, const basic_json_location<typename Json::char_type,typename Json::allocator_type>& path)
     {
         Json* current = std::addressof(root);
         for (const auto& path_node : path)
@@ -484,8 +486,8 @@ namespace jsonpath {
         return current;
     }
 
-    using json_location = basic_json_location<json>;
-    using wjson_location = basic_json_location<wjson>;
+    using json_location = basic_json_location<char>;
+    using wjson_location = basic_json_location<wchar_t>;
 
 } // namespace jsonpath
 } // namespace jsoncons
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
index 31cbb5190d..ab5f6788a3 100644
--- a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
+++ b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
@@ -111,7 +111,7 @@ namespace detail {
         using token_type = token<Json,JsonReference>;
         using path_expression_type = path_expression<Json,JsonReference>;
         using expression_type = expression<Json,JsonReference>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<char_type,allocator_type>;
         using path_node_type = path_node<typename Json::char_type>;
         using selector_type = jsonpath_selector<Json,JsonReference>;
 
@@ -2497,7 +2497,7 @@ namespace detail {
         using allocator_type = typename value_type::allocator_type;
         using evaluator_type = typename jsoncons::jsonpath::detail::jsonpath_evaluator<value_type, reference>;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<typename Json::char_type,typename Json::allocator_type>;
         using path_expression_type = jsoncons::jsonpath::detail::path_expression<value_type,reference>;
         using path_pointer = const path_node_type*;
     };
@@ -2516,7 +2516,7 @@ namespace detail {
         using allocator_type = typename value_type::allocator_type;
         using evaluator_type = typename jsoncons::jsonpath::detail::jsonpath_evaluator<value_type, reference>;
         using path_node_type = path_node<typename Json::char_type>;
-        using json_location_type = basic_json_location<Json>;
+        using json_location_type = basic_json_location<typename Json::char_type,typename Json::allocator_type>;
         using path_expression_type = jsoncons::jsonpath::detail::path_expression<value_type,reference>;
         using path_pointer = const path_node_type*;
     };