accessor functions have source_location parameters

Author: grisumbras

include/boost/json/array.hpp

@@ -616,20 +616,29 @@ class array
 
         @param pos A zero-based index.
 
+        @param loc `source_location` to use in thrown exception; the source
+            location of the call site by default.
+
         @throw `boost::system::system_error` `pos >= size()`.
     */
     /** @{ */
     inline
     value&
-    at(std::size_t pos) &;
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &;
 
     inline
     value&&
-    at(std::size_t pos) &&;
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) &&;
 
     BOOST_JSON_DECL
     value const&
-    at(std::size_t pos) const&;
+    at(
+        std::size_t pos,
+        source_location const& loc = BOOST_CURRENT_LOCATION) const&;
     /** @} */
 
     /** Access an element.

include/boost/json/impl/array.hpp

@@ -204,17 +204,17 @@ emplace_back(Arg&& arg)
 
 value&
 array::
-at(std::size_t pos) &
+at(std::size_t pos, source_location const& loc) &
 {
     auto const& self = *this;
-    return const_cast< value& >( self.at(pos) );
+    return const_cast< value& >( self.at(pos, loc) );
 }
 
 value&&
 array::
-at(std::size_t pos) &&
+at(std::size_t pos, source_location const& loc) &&
 {
-    return std::move( at(pos) );
+    return std::move( at(pos, loc) );
 }
 
 value&

include/boost/json/impl/array.ipp

@@ -400,9 +400,9 @@ array::try_at(std::size_t pos) const noexcept
 
 value const&
 array::
-array::at(std::size_t pos) const&
+array::at(std::size_t pos, source_location const& loc) const&
 {
-    return try_at(pos).value();
+    return try_at(pos).value(loc);
 }
 
 //----------------------------------------------------------

include/boost/json/impl/object.hpp

@@ -362,17 +362,17 @@ reserve(std::size_t new_capacity)
 
 value&
 object::
-at(string_view key) &
+at(string_view key, source_location const& loc) &
 {
     auto const& self = *this;
-    return const_cast< value& >( self.at(key) );
+    return const_cast< value& >( self.at(key, loc) );
 }
 
 value&&
 object::
-at(string_view key) &&
+at(string_view key, source_location const& loc) &&
 {
-    return std::move( at(key) );
+    return std::move( at(key, loc) );
 }
 
 //----------------------------------------------------------

include/boost/json/impl/object.ipp

@@ -455,9 +455,9 @@ try_at(string_view key) const noexcept
 
 value const&
 object::
-at(string_view key) const&
+at(string_view key, source_location const& loc) const&
 {
-    return try_at(key).value();
+    return try_at(key).value(loc);
 }
 
 //----------------------------------------------------------

include/boost/json/impl/pointer.ipp

@@ -341,6 +341,12 @@ walk_pointer(
 
 } // namespace detail
 
+value const&
+value::at_pointer(string_view ptr, source_location const& loc) const&
+{
+    return try_at_pointer(ptr).value(loc);
+}
+
 system::result<value const&>
 value::try_at_pointer(string_view ptr) const noexcept
 {

include/boost/json/impl/string.hpp

@@ -239,11 +239,11 @@ append(
 }
 
 char&
-string::at(std::size_t pos)
+string::at(std::size_t pos, source_location const& loc)
 {
 
     auto const& self = *this;
-    return const_cast< char& >( self.at(pos) );
+    return const_cast< char& >( self.at(pos, loc) );
 }
 
 } // namespace json

include/boost/json/impl/string.ipp

@@ -233,9 +233,9 @@ string::try_at(std::size_t pos) const noexcept
 }
 
 char const&
-string::at(std::size_t pos) const
+string::at(std::size_t pos, source_location const& loc) const
 {
-    return try_at(pos).value();
+    return try_at(pos).value(loc);
 }
 
 //----------------------------------------------------------

include/boost/json/impl/value.hpp

@@ -13,22 +13,17 @@
 namespace boost {
 namespace json {
 
-value const&
-value::at_pointer(string_view ptr) const&
-{
-    return try_at_pointer(ptr).value();
-}
-
 value&
-value::at_pointer(string_view ptr) &
+value::at_pointer(string_view ptr, source_location const& loc) &
 {
-    return try_at_pointer(ptr).value();
+    auto const& self = *this;
+    return const_cast<value&>( self.at_pointer(ptr, loc) );
 }
 
 value&&
-value::at_pointer(string_view ptr) &&
+value::at_pointer(string_view ptr, source_location const& loc) &&
 {
-    return std::move( try_at_pointer(ptr).value() );
+    return std::move( at_pointer(ptr, loc) );
 }
 
 } // namespace json

include/boost/json/impl/value.ipp

@@ -563,6 +563,72 @@ value::try_at(std::size_t pos) const noexcept
     return r->try_at(pos);
 }
 
+object const&
+value::as_object(source_location const& loc) const&
+{
+    return try_as_object().value(loc);
+}
+
+array const&
+value::as_array(source_location const& loc) const&
+{
+    return try_as_array().value(loc);
+}
+
+string const&
+value::as_string(source_location const& loc) const&
+{
+    return try_as_string().value(loc);
+}
+
+std::int64_t&
+value::as_int64(source_location const& loc)
+{
+    return try_as_int64().value(loc);
+}
+
+std::int64_t
+value::as_int64(source_location const& loc) const
+{
+    return try_as_int64().value(loc);
+}
+
+std::uint64_t&
+value::as_uint64(source_location const& loc)
+{
+    return try_as_uint64().value(loc);
+}
+
+std::uint64_t
+value::as_uint64(source_location const& loc) const
+{
+    return try_as_uint64().value(loc);
+}
+
+double&
+value::as_double(source_location const& loc)
+{
+    return try_as_double().value(loc);
+}
+
+double
+value::as_double(source_location const& loc) const
+{
+    return try_as_double().value(loc);
+}
+
+bool&
+value::as_bool(source_location const& loc)
+{
+    return try_as_bool().value(loc);
+}
+
+bool
+value::as_bool(source_location const& loc) const
+{
+    return try_as_bool().value(loc);
+}
+
 //----------------------------------------------------------
 //
 // Modifiers