default source_location argument for throwing functions

boostorg · Jan 9, 2023 · 607b21d · 607b21d
1 parent 36552f0
commit 607b21d
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 138 deletions.
diff --git a/include/boost/json/detail/except.hpp b/include/boost/json/detail/except.hpp
@@ -20,11 +20,11 @@ namespace detail {
     BOOST_STATIC_CONSTEXPR source_location loc = BOOST_CURRENT_LOCATION; \
     (ec).assign(e, &loc);
 
-BOOST_JSON_DECL void BOOST_NORETURN throw_bad_alloc(source_location const& loc);
-BOOST_JSON_DECL void BOOST_NORETURN throw_invalid_argument(char const* what, source_location const& loc);
-BOOST_JSON_DECL void BOOST_NORETURN throw_length_error(char const* what, source_location const& loc);
-BOOST_JSON_DECL void BOOST_NORETURN throw_out_of_range(source_location const& loc);
-BOOST_JSON_DECL void BOOST_NORETURN throw_system_error(error_code const& ec, source_location const& loc);
+BOOST_JSON_DECL void BOOST_NORETURN throw_bad_alloc(source_location const& loc = BOOST_CURRENT_LOCATION);
+BOOST_JSON_DECL void BOOST_NORETURN throw_invalid_argument(char const* what, source_location const& loc = BOOST_CURRENT_LOCATION);
+BOOST_JSON_DECL void BOOST_NORETURN throw_length_error(char const* what, source_location const& loc = BOOST_CURRENT_LOCATION);
+BOOST_JSON_DECL void BOOST_NORETURN throw_out_of_range(source_location const& loc = BOOST_CURRENT_LOCATION);
+BOOST_JSON_DECL void BOOST_NORETURN throw_system_error(error_code const& ec, source_location const& loc = BOOST_CURRENT_LOCATION);
 
 } // detail
 } // namespace json

diff --git a/include/boost/json/detail/impl/string_impl.ipp b/include/boost/json/detail/impl/string_impl.ipp
@@ -121,9 +121,7 @@ growth(
     std::size_t capacity)
 {
     if(new_size > max_size())
-        detail::throw_length_error(
-            "string too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "string too large" );
     // growth factor 2
     if( capacity >
         max_size() - capacity)
@@ -158,9 +156,7 @@ append(
     storage_ptr const& sp)
 {
     if(n > max_size() - size())
-        detail::throw_length_error(
-            "string too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "string too large" );
     if(n <= capacity() - size())
     {
         term(size() + n);
@@ -186,8 +182,7 @@ insert(
 {
     const auto curr_size = size();
     if(pos > curr_size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     const auto curr_data = data();
     if(n <= capacity() - curr_size)
     {
@@ -217,9 +212,7 @@ insert(
     else
     {
         if(n > max_size() - curr_size)
-            detail::throw_length_error(
-                "string too large",
-                BOOST_CURRENT_LOCATION);
+            detail::throw_length_error( "string too large" );
         string_impl tmp(growth(
             curr_size + n, capacity()), sp);
         tmp.size(curr_size + n);
@@ -249,8 +242,7 @@ insert_unchecked(
 {
     const auto curr_size = size();
     if(pos > curr_size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     const auto curr_data = data();
     if(n <= capacity() - size())
     {
@@ -264,9 +256,7 @@ insert_unchecked(
         return dest;
     }
     if(n > max_size() - curr_size)
-        detail::throw_length_error(
-            "string too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "string too large" );
     string_impl tmp(growth(
         curr_size + n, capacity()), sp);
     tmp.size(curr_size + n);
@@ -294,8 +284,7 @@ replace(
 {
     const auto curr_size = size();
     if (pos > curr_size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     const auto curr_data = data();
     n1 = (std::min)(n1, curr_size - pos);
     const auto delta = (std::max)(n1, n2) -
@@ -343,9 +332,7 @@ replace(
     else
     {
         if (delta > max_size() - curr_size)
-            detail::throw_length_error(
-                "string too large",
-                BOOST_CURRENT_LOCATION);
+            detail::throw_length_error( "string too large" );
         // would exceed capacity, reallocate
         string_impl tmp(growth(
             curr_size + delta, capacity()), sp);
@@ -379,8 +366,7 @@ replace_unchecked(
 {
     const auto curr_size = size();
     if(pos > curr_size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     const auto curr_data = data();
     const auto delta = (std::max)(n1, n2) -
         (std::min)(n1, n2);
@@ -401,9 +387,7 @@ replace_unchecked(
         return replace_pos;
     }
     if(delta > max_size() - curr_size)
-        detail::throw_length_error(
-            "string too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "string too large" );
     // would exceed capacity, reallocate
     string_impl tmp(growth(
         curr_size + delta, capacity()), sp);

diff --git a/include/boost/json/detail/value_to.hpp b/include/boost/json/detail/value_to.hpp
@@ -300,13 +300,13 @@ value_to_impl(
     if( !obj )
     {
         BOOST_JSON_FAIL(ec, error::not_object);
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
     }
 
     T result;
     ec = detail::try_reserve(result, obj->size(), reserve_implementation<T>());
     if( ec.failed() )
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
 
     auto ins = detail::inserter(result, inserter_implementation<T>());
     for( key_value_pair const& kv: *obj )
@@ -362,13 +362,13 @@ value_to_impl(
     if( !arr )
     {
         BOOST_JSON_FAIL(ec, error::not_array);
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
     }
 
     T result;
     ec = detail::try_reserve(result, arr->size(), reserve_implementation<T>());
     if( ec.failed() )
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
 
     auto ins = detail::inserter(result, inserter_implementation<T>());
     for( value const& val: *arr )
@@ -452,14 +452,14 @@ value_to_impl(
     if( !arr )
     {
         BOOST_JSON_FAIL(ec, error::not_array);
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
     }
 
     constexpr std::size_t N = std::tuple_size<remove_cvref<T>>::value;
     if( N != arr->size() )
     {
         BOOST_JSON_FAIL(ec, error::size_mismatch);
-        throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        throw_system_error( ec );
     }
 
     return make_tuple_like<T>(
@@ -627,7 +627,7 @@ value_to_impl(
 {
     auto res = tag_invoke(try_value_to_tag<T>(), jv);
     if( res.has_error() )
-        throw_system_error(res.error(), BOOST_CURRENT_LOCATION);
+        throw_system_error( res.error() );
     return std::move(*res);
 }
 

diff --git a/include/boost/json/impl/array.hpp b/include/boost/json/impl/array.hpp
@@ -207,8 +207,7 @@ array::
 at(std::size_t pos) &
 {
     if(pos >= t_->size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     return (*t_)[pos];
 }
 
@@ -224,8 +223,7 @@ array::
 at(std::size_t pos) const&
 {
     if(pos >= t_->size)
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     return (*t_)[pos];
 }
 

diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp
@@ -40,9 +40,7 @@ allocate(
 {
     BOOST_ASSERT(capacity > 0);
     if(capacity > array::max_size())
-        detail::throw_length_error(
-            "array too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "array too large" );
     auto p = reinterpret_cast<
         table*>(sp->allocate(
             sizeof(table) +
@@ -100,9 +98,7 @@ revert_insert(
         return;
     }
     if(n_ > max_size() - arr_->size())
-        detail::throw_length_error(
-            "array too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "array too large" );
     auto t = table::allocate(
         arr_->growth(arr_->size() + n_),
             arr_->sp_);
@@ -626,9 +622,7 @@ growth(
     std::size_t new_size) const
 {
     if(new_size > max_size())
-        detail::throw_length_error(
-            "array too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "array too large" );
     std::size_t const old = capacity();
     if(old > max_size() - old / 2)
         return new_size;

diff --git a/include/boost/json/impl/null_resource.ipp b/include/boost/json/impl/null_resource.ipp
@@ -66,8 +66,7 @@ protected:
         std::size_t,
         std::size_t) override
     {
-        detail::throw_bad_alloc(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_bad_alloc();
     }
 
     void

diff --git a/include/boost/json/impl/object.hpp b/include/boost/json/impl/object.hpp
@@ -342,8 +342,7 @@ at(string_view key) & ->
 {
     auto it = find(key);
     if(it == end())
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     return it->value();
 }
 
@@ -362,8 +361,7 @@ at(string_view key) const& ->
 {
     auto it = find(key);
     if(it == end())
-        detail::throw_out_of_range(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_out_of_range();
     return it->value();
 }
 
@@ -499,9 +497,7 @@ insert(
             std::distance(first, last));
     auto const n0 = size();
     if(n > max_size() - n0)
-        detail::throw_length_error(
-            "object too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "object too large" );
     reserve(n0 + n);
     revert_insert r(*this);
     while(first != last)

diff --git a/include/boost/json/impl/object.ipp b/include/boost/json/impl/object.ipp
@@ -448,9 +448,7 @@ insert(
 {
     auto const n0 = size();
     if(init.size() > max_size() - n0)
-        detail::throw_length_error(
-            "object too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "object too large" );
     reserve(n0 + init.size());
     revert_insert r(*this);
     if(t_->is_small())
@@ -786,9 +784,7 @@ growth(
     std::size_t new_size) const
 {
     if(new_size > max_size())
-        detail::throw_length_error(
-            "object too large",
-            BOOST_CURRENT_LOCATION);
+        detail::throw_length_error( "object too large" );
     std::size_t const old = capacity();
     if(old > max_size() - old / 2)
         return new_size;

diff --git a/include/boost/json/impl/parse.ipp b/include/boost/json/impl/parse.ipp
@@ -60,8 +60,7 @@ parse(
     auto jv = parse(
         s, ec, std::move(sp), opt);
     if(ec)
-        detail::throw_system_error(ec,
-            BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return jv;
 }
 
@@ -127,8 +126,7 @@ parse(
     auto jv = parse(
         is, ec, std::move(sp), opt);
     if(ec)
-        detail::throw_system_error(ec,
-            BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return jv;
 }
 

diff --git a/include/boost/json/impl/parser.ipp b/include/boost/json/impl/parser.ipp
@@ -92,8 +92,7 @@ write_some(
     auto const n = write_some(
         data, size, ec);
     if(ec)
-        detail::throw_system_error(ec,
-            BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return n;
 }
 
@@ -137,8 +136,7 @@ write(
     auto const n = write(
         data, size, ec);
     if(ec)
-        detail::throw_system_error(ec,
-            BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return n;
 }
 
@@ -156,8 +154,7 @@ release()
             p_.fail(ec);
         }
         detail::throw_system_error(
-            p_.last_error(),
-            BOOST_CURRENT_LOCATION);
+            p_.last_error());
     }
     return p_.handler().st.release();
 }

diff --git a/include/boost/json/impl/pointer.ipp b/include/boost/json/impl/pointer.ipp
@@ -347,7 +347,7 @@ value::at_pointer(string_view ptr) const&
     error_code ec;
     auto const found = find_pointer(ptr, ec);
     if( !found )
-        detail::throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return *found;
 }
 
@@ -491,7 +491,7 @@ value::set_at_pointer(
     error_code ec;
     value* result = set_at_pointer( sv, ref, ec, opts );
     if( !result )
-        detail::throw_system_error(ec, BOOST_CURRENT_LOCATION);
+        detail::throw_system_error( ec );
     return *result;
 }
 

diff --git a/include/boost/json/impl/static_resource.ipp b/include/boost/json/impl/static_resource.ipp
@@ -49,8 +49,7 @@ do_allocate(
     auto p = detail::align(
         align, n, p_, n_);
     if(! p)
-        detail::throw_bad_alloc(
-            BOOST_CURRENT_LOCATION);
+        detail::throw_bad_alloc();
     p_ = reinterpret_cast<char*>(p) + n;
     n_ -= n;
     return p;