Merge branch 'master' of https://github.com/danielaparker/jsoncons in…

…to clang-tidy
danielaparker · Dec 27, 2024 · 736475f · 736475f
2 parents c431dae + 3681111
commit 736475f
Show file tree

Hide file tree

Showing 37 changed files with 41 additions and 63 deletions.
diff --git a/include/jsoncons/byte_string.hpp b/include/jsoncons/byte_string.hpp
@@ -21,7 +21,7 @@
 
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/conv_error.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_exception.hpp>
 
 namespace jsoncons {

diff --git a/include/jsoncons/decode_traits.hpp b/include/jsoncons/decode_traits.hpp
@@ -14,7 +14,7 @@
 #include <type_traits> // std::enable_if, std::true_type, std::false_type
 
 #include <jsoncons/conv_error.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_decoder.hpp>
 #include <jsoncons/json_type_traits.hpp>
 #include <jsoncons/json_visitor.hpp>

diff --git a/include/jsoncons/detail/span.hpp b/include/jsoncons/detail/span.hpp
@@ -14,7 +14,7 @@
 #include <utility> // std::swap
 
 #include <jsoncons/config/compiler_support.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons
 {

diff --git a/include/jsoncons/detail/write_number.hpp b/include/jsoncons/detail/write_number.hpp
@@ -18,7 +18,7 @@
 #include <jsoncons/config/jsoncons_config.hpp>
 #include <jsoncons/detail/grisu3.hpp>
 #include <jsoncons/detail/parse_number.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_options.hpp>
 
 namespace jsoncons { 

diff --git a/include/jsoncons/json_exception.hpp b/include/jsoncons/json_exception.hpp
@@ -12,8 +12,8 @@
 #include <system_error> // std::error_code
 
 #include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/extension_traits.hpp>
-#include <jsoncons/unicode_traits.hpp> // unicode_traits::convert
+#include <jsoncons/utility/extension_traits.hpp>
+#include <jsoncons/utility/unicode_traits.hpp> // unicode_traits::convert
 
 namespace jsoncons {
 

diff --git a/include/jsoncons/json_options.hpp b/include/jsoncons/json_options.hpp
@@ -12,7 +12,7 @@
 #include <limits> // std::numeric_limits
 #include <string>
 
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_error.hpp>
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/ser_context.hpp>

diff --git a/include/jsoncons/json_traits_macros.hpp b/include/jsoncons/json_traits_macros.hpp
@@ -15,7 +15,7 @@
 #include <utility>
 
 #include <jsoncons/config/jsoncons_config.hpp> // JSONCONS_EXPAND, JSONCONS_QUOTE
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_type_traits.hpp>
 #include <jsoncons/json_visitor.hpp>
 

diff --git a/include/jsoncons/json_type_traits.hpp b/include/jsoncons/json_type_traits.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 
 #include <jsoncons/conv_error.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_type.hpp>
 #include <jsoncons/json_visitor.hpp>
 #include <jsoncons/utility/bigint.hpp>

diff --git a/include/jsoncons/sink.hpp b/include/jsoncons/sink.hpp
@@ -17,7 +17,7 @@
 #include <vector>
 
 #include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons { 
 

diff --git a/include/jsoncons/source.hpp b/include/jsoncons/source.hpp
@@ -20,7 +20,7 @@
 
 #include <jsoncons/byte_string.hpp> // jsoncons::byte_traits
 #include <jsoncons/config/jsoncons_config.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons { 
 

diff --git a/include/jsoncons/source_adaptor.hpp b/include/jsoncons/source_adaptor.hpp
@@ -18,7 +18,7 @@
 #include <jsoncons/json_error.hpp> // json_errc
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/source.hpp>
-#include <jsoncons/unicode_traits.hpp>
+#include <jsoncons/utility/unicode_traits.hpp>
 
 namespace jsoncons {
 

diff --git a/include/jsoncons/text_source_adaptor.hpp b/include/jsoncons/text_source_adaptor.hpp
@@ -18,7 +18,7 @@
 #include <jsoncons/json_error.hpp> // json_errc
 #include <jsoncons/json_exception.hpp>
 #include <jsoncons/source.hpp>
-#include <jsoncons/unicode_traits.hpp>
+#include <jsoncons/utility/unicode_traits.hpp>
 
 namespace jsoncons {
 

diff --git a/include/jsoncons/extension_traits.hpp → ...ude/jsoncons/utility/extension_traits.hpp b/include/jsoncons/extension_traits.hpp → ...ude/jsoncons/utility/extension_traits.hpp
@@ -4,8 +4,8 @@
 
 // See https://github.com/danielaparker/jsoncons for latest version
 
-#ifndef JSONCONS_EXTENSION_TRAITS_HPP
-#define JSONCONS_EXTENSION_TRAITS_HPP
+#ifndef JSONCONS_UTILITY_EXTENSION_TRAITS_HPP
+#define JSONCONS_UTILITY_EXTENSION_TRAITS_HPP
 
 #include <array> // std::array
 #include <climits> // CHAR_BIT
@@ -920,4 +920,4 @@ namespace impl {
 } // extension_traits
 } // jsoncons
 
-#endif // JSONCONS_EXTENSION_TRAITS_HPP
+#endif // JSONCONS_UTILITY_EXTENSION_TRAITS_HPP
diff --git a/include/jsoncons/unicode_traits.hpp → include/jsoncons/utility/unicode_traits.hpp b/include/jsoncons/unicode_traits.hpp → include/jsoncons/utility/unicode_traits.hpp
@@ -13,8 +13,8 @@
  * Unicode Standard."
 */
 
-#ifndef JSONCONS_UNICODE_TRAITS_HPP
-#define JSONCONS_UNICODE_TRAITS_HPP
+#ifndef JSONCONS_UTILITY_UNICODE_TRAITS_HPP
+#define JSONCONS_UTILITY_UNICODE_TRAITS_HPP
 
 #include <cstring>
 #include <iterator>
@@ -24,7 +24,7 @@
 #include <type_traits>
 
 #include <jsoncons/config/compiler_support.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 
 namespace jsoncons { namespace unicode_traits {
 
@@ -1327,5 +1327,5 @@ namespace jsoncons { namespace unicode_traits {
 } // unicode_traits
 } // jsoncons
 
-#endif //JSONCONS_UNICODE_TRAITS_HPP
+#endif //JSONCONS_UTILITY_UNICODE_TRAITS_HPP
 
diff --git a/include/jsoncons/value_converter.hpp b/include/jsoncons/value_converter.hpp
@@ -12,7 +12,7 @@
 #include <jsoncons/byte_string.hpp>
 #include <jsoncons/conv_error.hpp>
 #include <jsoncons/detail/write_number.hpp> // from_integer
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json_type.hpp>
 #include <jsoncons/tag_type.hpp>
 

diff --git a/include/jsoncons_ext/jmespath/jmespath.hpp b/include/jsoncons_ext/jmespath/jmespath.hpp
@@ -5502,4 +5502,4 @@ namespace jmespath {
 } // namespace jmespath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JMESPATH_JMESPATH_HPP
diff --git a/include/jsoncons_ext/jmespath/jmespath_error.hpp b/include/jsoncons_ext/jmespath/jmespath_error.hpp
@@ -213,4 +213,4 @@ namespace std {
     };
 }
 
-#endif
+#endif // JSONCONS_EXT_JMESPATH_JMESPATH_ERROR_HPP
diff --git a/include/jsoncons_ext/jsonpatch/jsonpatch.hpp b/include/jsoncons_ext/jsonpatch/jsonpatch.hpp
@@ -583,4 +583,4 @@ void apply_patch(Json& target, const Json& patch)
 
 }}
 
-#endif
+#endif // JSONCONS_EXT_JSONPATCH_JSONPATCH_HPP
diff --git a/include/jsoncons_ext/jsonpatch/jsonpatch_error.hpp b/include/jsoncons_ext/jsonpatch/jsonpatch_error.hpp
@@ -119,4 +119,4 @@ namespace jsoncons { namespace jsonpatch {
 } // jsonpatch
 } // jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATCH_JSONPATCH_ERROR_HPP
diff --git a/include/jsoncons_ext/jsonpath/expression.hpp b/include/jsoncons_ext/jsonpath/expression.hpp
@@ -3456,4 +3456,4 @@ namespace detail {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
+#endif // JSONCONS_EXT_JSONPATH_EXPRESSION_HPP
diff --git a/include/jsoncons_ext/jsonpath/flatten.hpp b/include/jsoncons_ext/jsonpath/flatten.hpp
@@ -377,4 +377,4 @@ namespace jsoncons { namespace jsonpath {
     }
 }}
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_FLATTEN_HPP
diff --git a/include/jsoncons_ext/jsonpath/json_location.hpp b/include/jsoncons_ext/jsonpath/json_location.hpp
@@ -953,4 +953,4 @@ namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSON_LOCATION_HPP
diff --git a/include/jsoncons_ext/jsonpath/json_location_parser.hpp b/include/jsoncons_ext/jsonpath/json_location_parser.hpp
diff --git a/include/jsoncons_ext/jsonpath/json_query.hpp b/include/jsoncons_ext/jsonpath/json_query.hpp
@@ -213,4 +213,4 @@ namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSON_QUERY_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath.hpp b/include/jsoncons_ext/jsonpath/jsonpath.hpp
@@ -11,4 +11,4 @@
 #include <jsoncons_ext/jsonpath/json_location.hpp>
 #include <jsoncons_ext/jsonpath/json_query.hpp>
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_error.hpp b/include/jsoncons_ext/jsonpath/jsonpath_error.hpp
@@ -247,4 +247,4 @@ namespace jsoncons { namespace jsonpath {
 
 }}
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_ERROR_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp b/include/jsoncons_ext/jsonpath/jsonpath_expression.hpp
@@ -259,4 +259,4 @@ namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPR_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_parser.hpp b/include/jsoncons_ext/jsonpath/jsonpath_parser.hpp
@@ -2486,4 +2486,4 @@ namespace detail {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_EXPRESSION_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_selector.hpp b/include/jsoncons_ext/jsonpath/jsonpath_selector.hpp
@@ -1317,4 +1317,4 @@ namespace detail {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_JSONPATH_SELECTOR_HPP
diff --git a/include/jsoncons_ext/jsonpath/jsonpath_utilities.hpp b/include/jsoncons_ext/jsonpath/jsonpath_utilities.hpp
@@ -74,4 +74,4 @@ namespace jsoncons { namespace jsonpath {
     }
 }}
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_UTILITIES_HPP
diff --git a/include/jsoncons_ext/jsonpath/path_node.hpp b/include/jsoncons_ext/jsonpath/path_node.hpp
@@ -337,4 +337,4 @@ namespace jsonpath {
 } // namespace jsonpath
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_JSONPATH_PATH_NODE_HPP
diff --git a/include/jsoncons_ext/mergepatch/mergepatch.hpp b/include/jsoncons_ext/mergepatch/mergepatch.hpp
@@ -101,4 +101,4 @@ namespace mergepatch {
 } // namespace mergepatch
 } // namespace jsoncons
 
-#endif
+#endif // JSONCONS_EXT_MERGEPATCH_MERGEPATCH_HPP
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -129,6 +129,8 @@ add_executable(unit_tests
                corelib/src/utility/heap_string_tests.cpp
                corelib/src/utility/bigint_tests.cpp
                corelib/src/utility/uri_tests.cpp
+               corelib/src/utility/extension_traits_tests.cpp
+               corelib/src/utility/unicode_conv_tests.cpp
                corelib/src/detail/to_integer_tests.cpp
                corelib/src/double_round_trip_tests.cpp
                corelib/src/double_to_string_tests.cpp
@@ -180,11 +182,9 @@ add_executable(unit_tests
                corelib/src/short_string_tests.cpp
                corelib/src/source_tests.cpp
                corelib/src/staj_iterator_tests.cpp
-               corelib/src/extension_traits_tests.cpp
                corelib/src/polymorphic_allocator_tests.cpp
                corelib/src/scoped_allocator_adaptor_tests.cpp
                corelib/src/string_to_double_tests.cpp
-               corelib/src/unicode_conv_tests.cpp
                corelib/src/wjson_tests.cpp
                ubjson/src/decode_ubjson_tests.cpp
                ubjson/src/encode_ubjson_tests.cpp

diff --git a/test/corelib/src/double_to_string_tests.cpp b/test/corelib/src/double_to_string_tests.cpp
@@ -8,7 +8,7 @@
 
 #include <catch/catch.hpp>
 
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/json.hpp>
 #include <jsoncons/json_encoder.hpp>
 

diff --git a/test/corelib/src/extension_traits_tests.cpp → ...ib/src/utility/extension_traits_tests.cpp b/test/corelib/src/extension_traits_tests.cpp → ...ib/src/utility/extension_traits_tests.cpp
diff --git a/test/corelib/src/unicode_conv_tests.cpp → ...orelib/src/utility/unicode_conv_tests.cpp b/test/corelib/src/unicode_conv_tests.cpp → ...orelib/src/utility/unicode_conv_tests.cpp
diff --git a/test/corelib/src/value_converter_tests.cpp b/test/corelib/src/value_converter_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under Boost license
 
 #include <catch/catch.hpp>
-#include <jsoncons/extension_traits.hpp>
+#include <jsoncons/utility/extension_traits.hpp>
 #include <jsoncons/value_converter.hpp>
 #include <vector>
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,4 +213,4 @@ namespace std { @@
         };
     }
-    #endif
+    #endif // JSONCONS_EXT_JMESPATH_JMESPATH_ERROR_HPP
Original file line number	Diff line number	Diff line change
Expand Up		@@ -583,4 +583,4 @@ void apply_patch(Json& target, const Json& patch)

		}}

		#endif
		#endif // JSONCONS_EXT_JSONPATCH_JSONPATCH_HPP
Original file line number	Diff line number	Diff line change
Expand Up		@@ -247,4 +247,4 @@ namespace jsoncons { namespace jsonpath {

		}}

		#endif
		#endif // JSONCONS_EXT_JSONPATH_JSONPATH_ERROR_HPP