In progress

Author: Roy Bellingan

include/boost/json/impl/pointer.ipp

@@ -531,75 +531,49 @@ value::erase_at_pointer (
         return false;
     }
 
-    string_view previous_segment;
-
-    string_view segment = detail::next_segment(sv, ec);
-
-    auto result = this;
-    auto previous_result = this;
-
+    string_view walk = sv;
+    string_view last_segment;
     while (true)
     {
+        last_segment = detail::next_segment(walk, ec);
         if (ec.failed())
             return false;
-
-        if (!result)
-        {
-            BOOST_JSON_FAIL(ec, error::not_found);
-            return false;
-        }
-
-        if( segment.empty() )
+        if (walk.empty())
             break;
+    }
 
-        previous_segment = segment;
-        previous_result = result;
+    string_view const parent_sv(
+        sv.data(),
+        static_cast<std::size_t>(last_segment.data() - sv.data()));
 
-        switch (result->kind())
+    value* parent = detail::walk_pointer(
+        *this,
+        parent_sv,
+        ec,
+        []( object& obj, detail::pointer_token token )
         {
-            case boost::json::kind::object: {
-                auto& obj = result->get_object();
-
-                detail::pointer_token const token(segment);
-                segment = detail::next_segment(sv, ec);
-                if (ec.failed())
-                    return false;
-                
-                result = detail::if_contains_token(obj, token);
-                if( !result )
-                {
-                    BOOST_JSON_FAIL(ec, error::not_found);
-                    return false;
-                }
-                break;
-            }
-            case boost::json::kind::array: {
-                auto const index = detail::parse_number_token(segment, ec);
-                segment          = detail::next_segment(sv, ec);
-                if (ec.failed())
-                    return false;
-                
-                auto& arr = result->get_array();
-                result    = arr.if_contains(index);
-                if( !result )
-                {
-                    BOOST_JSON_FAIL(ec, error::past_the_end);
-                    return false;
-                }
-                break;
-            }
-            default: {
-                BOOST_JSON_FAIL(ec, error::value_is_scalar);
-                return false;
-            }
-        }
-    }
+            return detail::if_contains_token(obj, token);
+        },
+        []( array& arr, std::size_t index, system::error_code& ec ) -> value*
+        {
+            if( ec )
+                return nullptr;
+
+            return arr.if_contains(index);
+        },
+        []( value&, string_view)
+        {
+            return std::false_type();
+        });
+
+    if (!parent)
+        return false;
 
-    switch (previous_result->kind())
+    switch (parent->kind())
     {
         case boost::json::kind::object: {
-            auto& obj = previous_result->get_object();
-            detail::pointer_token const token(previous_segment);
+            auto& obj = parent->get_object();
+            detail::pointer_token const token(last_segment);
             key_value_pair* kv = detail::find_in_object(obj, token).first;
             if (kv) {
                 obj.erase(kv);
@@ -608,8 +582,8 @@ value::erase_at_pointer (
             return false;
         }
         case boost::json::kind::array: {
-            auto const index = detail::parse_number_token(previous_segment, ec);
-            auto& arr = previous_result->get_array();
+            auto const index = detail::parse_number_token(last_segment, ec);
+            auto& arr = parent->get_array();
             if (arr.if_contains(index)){
                 arr.erase(arr.begin() + index);
                 return true;

test/Jamfile

@@ -23,7 +23,6 @@ local SOURCES =
     doc_uses_allocator.cpp
     doc_using_numbers.cpp
     double.cpp
-    erase_at_pointer.cpp
     error.cpp
     fwd.cpp
     json.cpp