From 1521f71cd6f01c920664075335b315ce802cfe4a Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Sun, 18 May 2025 23:05:27 +0530 Subject: [PATCH 1/3] style(clang-tidy): Clean include headers of src/core/jsonpointer Reported by clang-tidy check misc-include-cleaner Refs: sourcemeta/blaze#429 Signed-off-by: Balakrishna Avulapati --- .../include/sourcemeta/core/jsonpointer.h | 5 ++--- .../sourcemeta/core/jsonpointer_pointer.h | 2 +- .../sourcemeta/core/jsonpointer_position.h | 4 +++- .../core/jsonpointer_subpointer_walker.h | 2 -- .../sourcemeta/core/jsonpointer_template.h | 3 +-- .../include/sourcemeta/core/jsonpointer_token.h | 2 +- .../include/sourcemeta/core/jsonpointer_walker.h | 5 ++--- src/core/jsonpointer/jsonpointer.cc | 16 +++++++++++----- src/core/jsonpointer/parser.h | 4 +++- src/core/jsonpointer/position.cc | 4 ++++ src/core/jsonpointer/stringify.h | 6 ++++-- test/jsonpointer/jsonpointer_error_test.cc | 1 + test/jsonpointer/jsonpointer_parse_error_test.cc | 2 ++ test/jsonpointer/jsonpointer_position_test.cc | 1 + test/jsonpointer/jsonpointer_token_test.cc | 1 + test/jsonpointer/jsonpointer_weakpointer_test.cc | 1 + 16 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h index bb7664412..63acef697 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h @@ -1,17 +1,16 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_H_ #define SOURCEMETA_CORE_JSONPOINTER_H_ +#include "sourcemeta/core/json_hash.h" +#include "sourcemeta/core/json_value.h" #ifndef SOURCEMETA_CORE_JSONPOINTER_EXPORT #include #endif -#include #include #include -#include #include -#include #include #include #include diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h index b8cc3cd5c..675235c19 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h @@ -1,6 +1,7 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_POINTER_H_ #define SOURCEMETA_CORE_JSONPOINTER_POINTER_H_ +#include #include #include // std::copy, std::equal @@ -8,7 +9,6 @@ #include // std::reference_wrapper #include // std::initializer_list #include // std::advance, std::back_inserter -#include // std::basic_ostringstream #include // std::enable_if_t, std::is_same_v #include // std::move #include // std::vector diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h index 6af0c84e0..03c754a72 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h @@ -1,11 +1,13 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_POSITION_H_ #define SOURCEMETA_CORE_JSONPOINTER_POSITION_H_ +#include "sourcemeta/core/json_hash.h" +#include "sourcemeta/core/json_value.h" +#include #ifndef SOURCEMETA_CORE_JSONPOINTER_EXPORT #include #endif -#include #include #include // std::uint64_t diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h index 85b40f9b0..348c97132 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h @@ -4,8 +4,6 @@ #include // std::ptrdiff_t #include // std::forward_iterator_tag -#include - namespace sourcemeta::core { /// @ingroup jsonpointer diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h index 5081ac256..d4f2a3f0f 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h @@ -1,8 +1,7 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_ #define SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_ -#include -#include +#include #include diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h index ef777d719..7a62c772b 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h @@ -1,7 +1,7 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_ #define SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_ -#include +#include "sourcemeta/core/json_value.h" #include // assert diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h index f7dec36c6..b431bb49a 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h @@ -1,11 +1,10 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_WALKER_H_ #define SOURCEMETA_CORE_JSONPOINTER_WALKER_H_ +#include "sourcemeta/core/json_value.h" +#include #include // std::vector -#include -#include - namespace sourcemeta::core { /// @ingroup jsonpointer diff --git a/src/core/jsonpointer/jsonpointer.cc b/src/core/jsonpointer/jsonpointer.cc index e221939a8..dd66ebd0a 100644 --- a/src/core/jsonpointer/jsonpointer.cc +++ b/src/core/jsonpointer/jsonpointer.cc @@ -1,14 +1,20 @@ +#include #include #include "grammar.h" #include "parser.h" +#include "sourcemeta/core/json.h" +#include "sourcemeta/core/json_hash.h" +#include "sourcemeta/core/json_value.h" +#include "sourcemeta/core/jsonpointer_pointer.h" +#include "sourcemeta/core/uri.h" #include "stringify.h" -#include // assert -#include // std::reference_wrapper -#include // std::cbegin, std::cend, std::prev -#include // std::allocator -#include // std::basic_ostringstream, std::basic_stringstream +#include // assert +#include // std::cbegin, std::cend, std::prev +#include // std::allocator +#include // std::basic_ostringstream, std::basic_stringstream +#include #include // std::is_same_v #include // std::move diff --git a/src/core/jsonpointer/parser.h b/src/core/jsonpointer/parser.h index b1bd7eb2a..c9fcc2a8d 100644 --- a/src/core/jsonpointer/parser.h +++ b/src/core/jsonpointer/parser.h @@ -2,9 +2,11 @@ #define SOURCEMETA_CORE_JSONPOINTER_PARSER_H_ #include "grammar.h" +#include "sourcemeta/core/json_value.h" +#include +#include #include -#include #include // std::basic_istream #include // std::basic_stringstream diff --git a/src/core/jsonpointer/position.cc b/src/core/jsonpointer/position.cc index afe9e1386..dae001bc9 100644 --- a/src/core/jsonpointer/position.cc +++ b/src/core/jsonpointer/position.cc @@ -1,3 +1,7 @@ +#include "sourcemeta/core/json_value.h" +#include +#include +#include #include #include // assert diff --git a/src/core/jsonpointer/stringify.h b/src/core/jsonpointer/stringify.h index d34f186ad..d7ff9e57f 100644 --- a/src/core/jsonpointer/stringify.h +++ b/src/core/jsonpointer/stringify.h @@ -2,14 +2,16 @@ #define SOURCEMETA_CORE_JSONPOINTER_STRINGIFY_H_ #include "grammar.h" +#include "sourcemeta/core/json_value.h" -#include -#include +#include +#include #include #include // std::basic_ostream #include // std::basic_istringstream #include // std::to_string, std::basic_string +#include // std::holds_alternative namespace sourcemeta::core::internal { inline auto diff --git a/test/jsonpointer/jsonpointer_error_test.cc b/test/jsonpointer/jsonpointer_error_test.cc index e378e28e4..7245023c5 100644 --- a/test/jsonpointer/jsonpointer_error_test.cc +++ b/test/jsonpointer/jsonpointer_error_test.cc @@ -1,6 +1,7 @@ #include #include #include +#include #include // std::exception #include // std::string diff --git a/test/jsonpointer/jsonpointer_parse_error_test.cc b/test/jsonpointer/jsonpointer_parse_error_test.cc index 81d27e8a1..2b47978d6 100644 --- a/test/jsonpointer/jsonpointer_parse_error_test.cc +++ b/test/jsonpointer/jsonpointer_parse_error_test.cc @@ -4,7 +4,9 @@ #include #include +#include #include +#include #define EXPECT_JSON_PARSE_ERROR(input) \ try { \ diff --git a/test/jsonpointer/jsonpointer_position_test.cc b/test/jsonpointer/jsonpointer_position_test.cc index 1d6f8f99d..5468e486c 100644 --- a/test/jsonpointer/jsonpointer_position_test.cc +++ b/test/jsonpointer/jsonpointer_position_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONPointer_position, track_1) { const auto input{R"JSON([ diff --git a/test/jsonpointer/jsonpointer_token_test.cc b/test/jsonpointer/jsonpointer_token_test.cc index b9cb0033d..09389bbe9 100644 --- a/test/jsonpointer/jsonpointer_token_test.cc +++ b/test/jsonpointer/jsonpointer_token_test.cc @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/test/jsonpointer/jsonpointer_weakpointer_test.cc b/test/jsonpointer/jsonpointer_weakpointer_test.cc index b67e67e3b..eb7f44514 100644 --- a/test/jsonpointer/jsonpointer_weakpointer_test.cc +++ b/test/jsonpointer/jsonpointer_weakpointer_test.cc @@ -1,4 +1,5 @@ #include +#include #include #include From 71ccd1d92f6f0db5bff890e5e274e26eef6b6d79 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Wed, 21 May 2025 13:57:28 +0530 Subject: [PATCH 2/3] Address review comments about include conventions The order of the includes: sourcemeta includes followed by standard headers Also, sourcemeta headers use include paths Signed-off-by: Balakrishna Avulapati --- .../include/sourcemeta/core/jsonpointer.h | 4 ++-- .../sourcemeta/core/jsonpointer_pointer.h | 2 +- .../sourcemeta/core/jsonpointer_template.h | 15 ++++++------- .../sourcemeta/core/jsonpointer_token.h | 2 +- .../sourcemeta/core/jsonpointer_walker.h | 7 +++--- src/core/jsonpointer/jsonpointer.cc | 22 +++++++++---------- src/core/jsonpointer/parser.h | 4 ++-- src/core/jsonpointer/position.cc | 10 ++++----- src/core/jsonpointer/stringify.h | 6 ++--- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h index 63acef697..ae7a394a8 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h @@ -1,14 +1,14 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_H_ #define SOURCEMETA_CORE_JSONPOINTER_H_ -#include "sourcemeta/core/json_hash.h" -#include "sourcemeta/core/json_value.h" #ifndef SOURCEMETA_CORE_JSONPOINTER_EXPORT #include #endif #include +#include +#include #include #include #include diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h index 675235c19..8f67d09e7 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h @@ -1,11 +1,11 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_POINTER_H_ #define SOURCEMETA_CORE_JSONPOINTER_POINTER_H_ -#include #include #include // std::copy, std::equal #include // assert +#include // std::size_t #include // std::reference_wrapper #include // std::initializer_list #include // std::advance, std::back_inserter diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h index d4f2a3f0f..c79fb91f9 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h @@ -1,16 +1,15 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_ #define SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_ -#include - #include -#include // std::copy, std::all_of -#include // assert -#include // std::back_inserter -#include // std::optional, std::nullopt -#include // std::variant, std::holds_alternative, std::get -#include // std::vector +#include // std::copy, std::all_of +#include // assert +#include // std::initializer_list +#include // std::back_inserter +#include // std::optional, std::nullopt +#include // std::variant, std::holds_alternative, std::get +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h index 7a62c772b..e97bff5c7 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h @@ -1,7 +1,7 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_ #define SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_ -#include "sourcemeta/core/json_value.h" +#include #include // assert diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h index b431bb49a..c31545ca8 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h @@ -1,9 +1,10 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_WALKER_H_ #define SOURCEMETA_CORE_JSONPOINTER_WALKER_H_ -#include "sourcemeta/core/json_value.h" -#include -#include // std::vector +#include + +#include // std::size_t +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/jsonpointer/jsonpointer.cc b/src/core/jsonpointer/jsonpointer.cc index dd66ebd0a..8851470e7 100644 --- a/src/core/jsonpointer/jsonpointer.cc +++ b/src/core/jsonpointer/jsonpointer.cc @@ -1,20 +1,20 @@ -#include +#include +#include +#include #include +#include +#include #include "grammar.h" #include "parser.h" -#include "sourcemeta/core/json.h" -#include "sourcemeta/core/json_hash.h" -#include "sourcemeta/core/json_value.h" -#include "sourcemeta/core/jsonpointer_pointer.h" -#include "sourcemeta/core/uri.h" #include "stringify.h" -#include // assert -#include // std::cbegin, std::cend, std::prev -#include // std::allocator -#include // std::basic_ostringstream, std::basic_stringstream -#include +#include // assert +#include // std::cbegin, std::cend, std::prev +#include // std::allocator +#include // std::basic_ostream +#include // std::basic_ostringstream, std::basic_stringstream +#include // std::basic_string #include // std::is_same_v #include // std::move diff --git a/src/core/jsonpointer/parser.h b/src/core/jsonpointer/parser.h index c9fcc2a8d..8918d67d3 100644 --- a/src/core/jsonpointer/parser.h +++ b/src/core/jsonpointer/parser.h @@ -2,12 +2,12 @@ #define SOURCEMETA_CORE_JSONPOINTER_PARSER_H_ #include "grammar.h" -#include "sourcemeta/core/json_value.h" -#include +#include #include #include +#include // std::uint64_t #include // std::basic_istream #include // std::basic_stringstream #include // std::out_of_range diff --git a/src/core/jsonpointer/position.cc b/src/core/jsonpointer/position.cc index dae001bc9..99a4eed37 100644 --- a/src/core/jsonpointer/position.cc +++ b/src/core/jsonpointer/position.cc @@ -1,10 +1,10 @@ -#include "sourcemeta/core/json_value.h" -#include -#include -#include +#include #include -#include // assert +#include // assert +#include // std::size_t +#include // std::uint64_t +#include // std::optional namespace sourcemeta::core { diff --git a/src/core/jsonpointer/stringify.h b/src/core/jsonpointer/stringify.h index d7ff9e57f..f3405656c 100644 --- a/src/core/jsonpointer/stringify.h +++ b/src/core/jsonpointer/stringify.h @@ -2,12 +2,12 @@ #define SOURCEMETA_CORE_JSONPOINTER_STRINGIFY_H_ #include "grammar.h" -#include "sourcemeta/core/json_value.h" -#include -#include +#include #include +#include // assert +#include // std::basic_ostream #include // std::basic_ostream #include // std::basic_istringstream #include // std::to_string, std::basic_string From 5740a882e8bc1286eab4caf58cf6c57b93865e04 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Wed, 21 May 2025 19:47:38 +0530 Subject: [PATCH 3/3] fix missed file Signed-off-by: Balakrishna Avulapati --- .../include/sourcemeta/core/jsonpointer_position.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h index 03c754a72..268c32cfc 100644 --- a/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h +++ b/src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h @@ -1,15 +1,15 @@ #ifndef SOURCEMETA_CORE_JSONPOINTER_POSITION_H_ #define SOURCEMETA_CORE_JSONPOINTER_POSITION_H_ -#include "sourcemeta/core/json_hash.h" -#include "sourcemeta/core/json_value.h" -#include #ifndef SOURCEMETA_CORE_JSONPOINTER_EXPORT #include #endif +#include +#include #include +#include // std::size_t #include // std::uint64_t #include // std::map #include // std::optional