tidy code

danielaparker · danielaparker · commit a970b9c719dc · 2024-12-30T22:03:21.000-05:00
diff --git a/include/jsoncons/byte_string.hpp b/include/jsoncons/byte_string.hpp
@@ -366,7 +366,7 @@ namespace detail {
         template <typename Allocator>
         constexpr byte_string_view(const basic_byte_string<Allocator>& bytes);
 
-        constexpr byte_string_view(const byte_string_view&) noexcept = default;
+        constexpr byte_string_view(const byte_string_view&) = default;
 
         JSONCONS_CPP14_CONSTEXPR byte_string_view(byte_string_view&& other) noexcept
             : data_(nullptr), size_(0)
diff --git a/include/jsoncons/detail/optional.hpp b/include/jsoncons/detail/optional.hpp
@@ -209,7 +209,7 @@ namespace detail
                                 !is_constructible_convertible_or_assignable_from_optional<T,U>::value &&
                                 std::is_assignable<T&, U>::value,
             optional&>::type
-        operator=(optional<U>&& other)
+        operator=(optional<U>&& other) noexcept
         {
             if (other) 
             {
diff --git a/include/jsoncons/detail/span.hpp b/include/jsoncons/detail/span.hpp
@@ -104,9 +104,9 @@ namespace detail {
         {
         }
 
-        constexpr span(const span& other) noexcept = default;
+        constexpr span(const span& other) = default;
 
-        span& operator=( const span& other ) noexcept = default;
+        span& operator=( const span& other ) = default;
 
         constexpr pointer data() const noexcept
         {
diff --git a/include/jsoncons/detail/string_view.hpp b/include/jsoncons/detail/string_view.hpp
@@ -52,7 +52,7 @@ namespace detail {
             : data_(data), length_(Traits::length(data))
         {
         }
-        constexpr basic_string_view(const basic_string_view& other) noexcept = default;
+        constexpr basic_string_view(const basic_string_view& other) = default;
 
         template <typename Tr,typename Allocator>
         JSONCONS_CPP14_CONSTEXPR  basic_string_view(const std::basic_string<CharT,Tr,Allocator>& s) noexcept
diff --git a/include/jsoncons/item_event_visitor.hpp b/include/jsoncons/item_event_visitor.hpp
@@ -32,7 +32,7 @@ namespace jsoncons {
 
         basic_item_event_visitor() = default;
 
-        virtual ~basic_item_event_visitor() noexcept = default;
+        virtual ~basic_item_event_visitor() = default;
 
         void flush()
         {
diff --git a/include/jsoncons/json_exception.hpp b/include/jsoncons/json_exception.hpp
@@ -22,7 +22,7 @@ namespace jsoncons {
     class json_exception
     {
     public:
-        virtual ~json_exception() noexcept = default;
+        virtual ~json_exception() = default;
         virtual const char* what() const noexcept = 0;
     };
 
diff --git a/include/jsoncons/json_object.hpp b/include/jsoncons/json_object.hpp
@@ -352,7 +352,7 @@ namespace jsoncons {
             return *this;
         }
 
-        sorted_json_object& operator=(sorted_json_object&& other)
+        sorted_json_object& operator=(sorted_json_object&& other) noexcept
         {
             other.swap(*this);
             return *this;
diff --git a/include/jsoncons/json_options.hpp b/include/jsoncons/json_options.hpp
@@ -103,7 +103,7 @@ class basic_json_options_common
         max_nesting_depth_(1024)
     {}
 
-    virtual ~basic_json_options_common() noexcept = default;
+    virtual ~basic_json_options_common() = default;
 
     basic_json_options_common(const basic_json_options_common&) = default;
     basic_json_options_common& operator=(const basic_json_options_common&) = default;
@@ -268,7 +268,7 @@ class basic_json_decode_options : public virtual basic_json_options_common<CharT
 
     basic_json_decode_options(const basic_json_decode_options&) = default;
 
-    basic_json_decode_options(basic_json_decode_options&& other)
+    basic_json_decode_options(basic_json_decode_options&& other) noexcept
         : super_type(std::move(other)), lossless_number_(other.lossless_number_), err_handler_(std::move(other.err_handler_))
     {
     }
@@ -340,7 +340,7 @@ class basic_json_encode_options : public virtual basic_json_options_common<CharT
 
     basic_json_encode_options(const basic_json_encode_options&) = default;
 
-    basic_json_encode_options(basic_json_encode_options&& other)
+    basic_json_encode_options(basic_json_encode_options&& other) noexcept
         : super_type(std::move(other)),
           escape_all_non_ascii_(other.escape_all_non_ascii_),
           escape_solidus_(other.escape_solidus_),
diff --git a/include/jsoncons/json_visitor.hpp b/include/jsoncons/json_visitor.hpp
@@ -32,7 +32,7 @@ namespace jsoncons {
 
         basic_json_visitor() = default;
 
-        virtual ~basic_json_visitor() noexcept = default;
+        virtual ~basic_json_visitor() = default;
 
         void flush()
         {
diff --git a/include/jsoncons/ser_context.hpp b/include/jsoncons/ser_context.hpp
@@ -12,7 +12,7 @@ namespace jsoncons {
 class ser_context
 {
 public:
-    virtual ~ser_context() noexcept = default;
+    virtual ~ser_context() = default;
 
     virtual size_t line() const
     {
diff --git a/include/jsoncons/staj_cursor.hpp b/include/jsoncons/staj_cursor.hpp
@@ -640,7 +640,7 @@ template <typename CharT>
 class basic_staj_cursor
 {
 public:
-    virtual ~basic_staj_cursor() noexcept = default;
+    virtual ~basic_staj_cursor() = default;
 
     virtual void array_expected(std::error_code& ec)
     {
diff --git a/include/jsoncons/staj_event_reader.hpp b/include/jsoncons/staj_event_reader.hpp
@@ -631,7 +631,7 @@ namespace jsoncons {
     class basic_staj_event_reader
     {
     public:
-        virtual ~basic_staj_event_reader() noexcept = default;
+        virtual ~basic_staj_event_reader() = default;
 
         virtual void array_expected(std::error_code& ec)
         {
diff --git a/include/jsoncons/utility/heap_string.hpp b/include/jsoncons/utility/heap_string.hpp
@@ -47,7 +47,7 @@ namespace utility {
         {
         }
 
-        ~heap_string_base() noexcept = default;
+        ~heap_string_base() = default;
     };
 
     template <typename CharT,typename Extra,typename Allocator>
@@ -71,7 +71,7 @@ namespace utility {
         {
         }
 
-        ~heap_string() noexcept = default;
+        ~heap_string() = default;
 
         const char_type* c_str() const { return extension_traits::to_plain_pointer(p_); }
         const char_type* data() const { return extension_traits::to_plain_pointer(p_); }
diff --git a/include/jsoncons_ext/cbor/cbor_parser.hpp b/include/jsoncons_ext/cbor/cbor_parser.hpp
@@ -91,10 +91,10 @@ class basic_cbor_parser : public ser_context
         }
 
         mapped_string(const mapped_string&) = default;
-        mapped_string(mapped_string&&) noexcept = default;
+        mapped_string(mapped_string&&) = default;
 
         mapped_string& operator=(const mapped_string&) = default;
-        mapped_string& operator=(mapped_string&&) noexcept = default;
+        mapped_string& operator=(mapped_string&&) = default;
 
         mapped_string(const mapped_string& other, const allocator_type& alloc) 
             :  type(other.type), str(other.str,alloc), bytes(other.bytes,alloc)
diff --git a/include/jsoncons_ext/csv/csv_options.hpp b/include/jsoncons_ext/csv/csv_options.hpp
@@ -315,7 +315,7 @@ class basic_csv_options_common
     basic_csv_options_common& operator=(const basic_csv_options_common&) = default;
     //basic_csv_options_common& operator=(basic_csv_options_common&&) = default;
 
-    virtual ~basic_csv_options_common() noexcept = default;
+    virtual ~basic_csv_options_common() = default;
 public:
 
     char_type field_delimiter() const 
@@ -491,7 +491,7 @@ class basic_csv_decode_options : public virtual basic_csv_options_common<CharT>
 
     basic_csv_decode_options(const basic_csv_decode_options& other) = default;
 
-    basic_csv_decode_options(basic_csv_decode_options&& other)
+    basic_csv_decode_options(basic_csv_decode_options&& other) noexcept
         : super_type(std::move(other)),
           assume_header_(other.assume_header_),
           ignore_empty_values_(other.ignore_empty_values_),
@@ -631,7 +631,7 @@ class basic_csv_encode_options : public virtual basic_csv_options_common<CharT>
 
     basic_csv_encode_options(const basic_csv_encode_options& other) = default;
 
-    basic_csv_encode_options(basic_csv_encode_options&& other)
+    basic_csv_encode_options(basic_csv_encode_options&& other) noexcept
         : super_type(std::move(other)),
           quote_style_(other.quote_style_),
           float_format_(other.float_format_),
diff --git a/include/jsoncons_ext/csv/csv_reader.hpp b/include/jsoncons_ext/csv/csv_reader.hpp
@@ -112,7 +112,7 @@ namespace jsoncons { namespace csv {
         {
         }
 
-        ~basic_csv_reader() noexcept = default;
+        ~basic_csv_reader() = default;
 
         basic_csv_reader& operator = (const basic_csv_reader&) = delete; 
         basic_csv_reader& operator = (basic_csv_reader&&) = delete; 
@@ -184,7 +184,7 @@ namespace jsoncons { namespace csv {
     using csv_stream_reader = basic_csv_reader<char,stream_source<char>>;
     using wcsv_stream_reader = basic_csv_reader<wchar_t,stream_source<wchar_t>>;
 
-} // namespace jsonpath
+} // namespace csv
 } // namespace jsoncons
 
 #endif // JSONCONS_EXT_CSV_CSV_READER_HPP
diff --git a/include/jsoncons_ext/jmespath/jmespath.hpp b/include/jsoncons_ext/jmespath/jmespath.hpp
@@ -2220,7 +2220,7 @@ namespace detail {
                 construct(std::move(other));
             }
 
-            token& operator=(token&& other)
+            token& operator=(token&& other) noexcept
             {
                 if (&other != this)
                 {
diff --git a/include/jsoncons_ext/jmespath/jmespath_error.hpp b/include/jsoncons_ext/jmespath/jmespath_error.hpp
@@ -39,7 +39,7 @@ namespace jsoncons { namespace jmespath {
 
         jmespath_error(jmespath_error&& other) = default;
         
-        ~jmespath_error() = default;
+        ~jmespath_error() override = default;
 
         const char* what() const noexcept override
         {
diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -297,15 +297,15 @@ namespace jsonpath {
             }
         }
 
-        parameter(const parameter& other) noexcept = default;
+        parameter(const parameter& other) = default;
 
-        parameter(parameter&& other) noexcept = default;
+        parameter(parameter&& other) = default;
         
         ~parameter() = default; 
 
-        parameter& operator=(const parameter& other) noexcept = default;
+        parameter& operator=(const parameter& other) = default;
 
-        parameter& operator=(parameter&& other) noexcept = default;
+        parameter& operator=(parameter&& other) = default;
 
         const Json& value() const
         {
@@ -327,6 +327,9 @@ namespace jsonpath {
         optional<std::size_t> arity_;
         function_type f_;
 
+        custom_function(const custom_function&) = default;
+        custom_function(custom_function&&) = default;
+
         custom_function(const string_type& function_name,
                         const optional<std::size_t>& arity,
                         const function_type& f)
@@ -344,13 +347,12 @@ namespace jsonpath {
               f_(std::move(f))
         {
         }
-
-        custom_function(const custom_function&) = default;
-
-        custom_function(custom_function&&) = default;
         
         ~custom_function() = default; 
 
+        custom_function& operator=(const custom_function&) = default;
+        custom_function& operator=(custom_function&&) = default;
+
         const string_type& name() const 
         {
             return function_name_;
@@ -1052,7 +1054,7 @@ namespace detail {
         function_base(const function_base&) = default;
         function_base(function_base&&) = default;
         
-        virtual ~function_base() noexcept = default;
+        virtual ~function_base() = default;
 
         function_base& operator=(const function_base&) = default;
         function_base& operator=(function_base&&) = default;
@@ -1565,7 +1567,7 @@ namespace detail {
                     {
                         return value_type(sn, semantic_tag::none);
                     }
-                    const const jsoncons::detail::chars_to to_double;
+                    const jsoncons::detail::chars_to to_double;
                     try
                     {
                         auto s = arg0.as_string();
@@ -2196,7 +2198,14 @@ namespace detail {
         using reference = JsonReference;
         using path_node_type = basic_path_node<typename Json::char_type>;
 
-        virtual ~node_receiver() noexcept = default;
+        node_receiver() = default;
+        node_receiver(const node_receiver&) = default;
+        node_receiver(node_receiver&&) = default;
+
+        virtual ~node_receiver() = default;
+
+        node_receiver& operator=(const node_receiver&) = default;
+        node_receiver& operator=(node_receiver&&) = default;
 
         virtual void add(const path_node_type& base_path, reference value) = 0;
     };
@@ -2347,7 +2356,7 @@ namespace detail {
         {
         }
 
-        virtual ~jsonpath_selector() noexcept = default;
+        virtual ~jsonpath_selector() = default;
 
         bool is_path() const 
         {
@@ -2642,7 +2651,7 @@ namespace detail {
         expression_base(const expression_base&) = default;
         expression_base(expression_base&&) = default;
 
-        virtual ~expression_base() noexcept = default;
+        virtual ~expression_base() = default;
 
         expression_base& operator=(const expression_base&) = default;
         expression_base& operator=(expression_base&&) = default;
@@ -2677,6 +2686,13 @@ namespace detail {
         };
     public:
 
+        token(const token& other) = delete;
+
+        token(token&& other) noexcept
+        {
+            construct(std::move(other));
+        }
+
         token(const unary_operator<Json>* expr) noexcept
             : token_kind_(jsonpath_token_kind::unary_operator),
               unary_operator_(expr)
@@ -2781,11 +2797,6 @@ namespace detail {
         {
         }
 
-        token(token&& other) noexcept
-        {
-            construct(std::move(other));
-        }
-
         const Json& get_value(const_reference_arg_t, eval_context<Json,JsonReference>&) const
         {
             return value_;
@@ -2800,7 +2811,9 @@ namespace detail {
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
-        token& operator=(token&& other)
+        token& operator=(const token& other) = delete;
+
+        token& operator=(token&& other) noexcept
         {
 
             if (&other != this)
@@ -2918,7 +2931,7 @@ namespace detail {
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
-        void construct(token&& other)
+        void construct(token&& other) noexcept
         {
             token_kind_ = other.token_kind_;
             switch (token_kind_)
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_error.hpp b/include/jsoncons_ext/jsonpath/jsonpath_error.hpp
@@ -202,7 +202,7 @@ namespace jsoncons { namespace jsonpath {
 
         jsonpath_error(jsonpath_error&& other) = default;
         
-        ~jsonpath_error() = default;
+        ~jsonpath_error() override = default;
 
         const char* what() const noexcept override
         {
diff --git a/include/jsoncons_ext/jsonschema/common/evaluation_context.hpp b/include/jsoncons_ext/jsonschema/common/evaluation_context.hpp
@@ -78,7 +78,7 @@ namespace jsonschema {
         {
         }
 
-        evaluation_context(evaluation_context&& other)
+        evaluation_context(evaluation_context&& other) noexcept
             : dynamic_scope_{std::move(other.dynamic_scope_)},eval_path_{std::move(other.eval_path_)},
               flags_(other.flags_)
         {
diff --git a/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp b/include/jsoncons_ext/jsonschema/common/keyword_validators.hpp
diff --git a/include/jsoncons_ext/jsonschema/evaluation_options.hpp b/include/jsoncons_ext/jsonschema/evaluation_options.hpp
diff --git a/include/jsoncons_ext/ubjson/ubjson_encoder.hpp b/include/jsoncons_ext/ubjson/ubjson_encoder.hpp
diff --git a/test/thirdparty/catch/catch.hpp b/test/thirdparty/catch/catch.hpp

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ namespace detail`
`209`	`209`	`!is_constructible_convertible_or_assignable_from_optional<T,U>::value &&`
`210`	`210`	`std::is_assignable<T&, U>::value,`
`211`	`211`	`optional&>::type`
`212`		`- operator=(optional<U>&& other)`
	`212`	`+ operator=(optional<U>&& other) noexcept`
`213`	`213`	`{`
`214`	`214`	`if (other)`
`215`	`215`	`{`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ namespace detail {`
`104`	`104`	`{`
`105`	`105`	`}`
`106`	`106`
`107`		`- constexpr span(const span& other) noexcept = default;`
	`107`	`+ constexpr span(const span& other) = default;`
`108`	`108`
`109`		`- span& operator=( const span& other ) noexcept = default;`
	`109`	`+ span& operator=( const span& other ) = default;`
`110`	`110`
`111`	`111`	`constexpr pointer data() const noexcept`
`112`	`112`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace detail {`
`52`	`52`	`: data_(data), length_(Traits::length(data))`
`53`	`53`	`{`
`54`	`54`	`}`
`55`		`- constexpr basic_string_view(const basic_string_view& other) noexcept = default;`
	`55`	`+ constexpr basic_string_view(const basic_string_view& other) = default;`
`56`	`56`
`57`	`57`	`template <typename Tr,typename Allocator>`
`58`	`58`	`JSONCONS_CPP14_CONSTEXPR basic_string_view(const std::basic_string<CharT,Tr,Allocator>& s) noexcept`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace jsoncons {`
`32`	`32`
`33`	`33`	`basic_item_event_visitor() = default;`
`34`	`34`
`35`		`- virtual ~basic_item_event_visitor() noexcept = default;`
	`35`	`+ virtual ~basic_item_event_visitor() = default;`
`36`	`36`
`37`	`37`	`void flush()`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace jsoncons {`
`22`	`22`	`class json_exception`
`23`	`23`	`{`
`24`	`24`	`public:`
`25`		`- virtual ~json_exception() noexcept = default;`
	`25`	`+ virtual ~json_exception() = default;`
`26`	`26`	`virtual const char* what() const noexcept = 0;`
`27`	`27`	`};`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ namespace jsoncons {`
`352`	`352`	`return *this;`
`353`	`353`	`}`
`354`	`354`
`355`		`- sorted_json_object& operator=(sorted_json_object&& other)`
	`355`	`+ sorted_json_object& operator=(sorted_json_object&& other) noexcept`
`356`	`356`	`{`
`357`	`357`	`other.swap(*this);`
`358`	`358`	`return *this;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace jsoncons {`
`12`	`12`	`class ser_context`
`13`	`13`	`{`
`14`	`14`	`public:`
`15`		`- virtual ~ser_context() noexcept = default;`
	`15`	`+ virtual ~ser_context() = default;`
`16`	`16`
`17`	`17`	`virtual size_t line() const`
`18`	`18`	`{`