From cfa54918e96af720ae9d000c08755c1be1683845 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Sun, 18 May 2025 22:38:59 +0530 Subject: [PATCH 1/3] style(clang-tidy): Clean include headers of src/core/json Reported by clang-tidy check `misc-include-cleaner` Refs: https://github.com/sourcemeta/blaze/issues/429 Signed-off-by: Balakrishna Avulapati --- src/core/json/include/sourcemeta/core/json.h | 1 - src/core/json/include/sourcemeta/core/json_error.h | 2 ++ src/core/json/include/sourcemeta/core/json_object.h | 6 +++--- src/core/json/include/sourcemeta/core/json_value.h | 2 +- src/core/json/json.cc | 12 ++++++++++-- src/core/json/json_value.cc | 11 +++++++++-- src/core/json/parser.h | 3 ++- src/core/json/stringify.h | 8 ++++++-- 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/core/json/include/sourcemeta/core/json.h b/src/core/json/include/sourcemeta/core/json.h index 0603ca35c..a3c835e32 100644 --- a/src/core/json/include/sourcemeta/core/json.h +++ b/src/core/json/include/sourcemeta/core/json.h @@ -5,7 +5,6 @@ #include #endif -#include #include #include // std::uint64_t diff --git a/src/core/json/include/sourcemeta/core/json_error.h b/src/core/json/include/sourcemeta/core/json_error.h index 0fe1e3c6f..899160474 100644 --- a/src/core/json/include/sourcemeta/core/json_error.h +++ b/src/core/json/include/sourcemeta/core/json_error.h @@ -1,6 +1,8 @@ #ifndef SOURCEMETA_CORE_JSON_ERROR_H_ #define SOURCEMETA_CORE_JSON_ERROR_H_ +#include +#include #ifndef SOURCEMETA_CORE_JSON_EXPORT #include #endif diff --git a/src/core/json/include/sourcemeta/core/json_object.h b/src/core/json/include/sourcemeta/core/json_object.h index 7885fbdd0..fbd15759d 100644 --- a/src/core/json/include/sourcemeta/core/json_object.h +++ b/src/core/json/include/sourcemeta/core/json_object.h @@ -1,9 +1,9 @@ #ifndef SOURCEMETA_CORE_JSON_OBJECT_H_ #define SOURCEMETA_CORE_JSON_OBJECT_H_ -#include // std::swap -#include // assert -#include // std::equal_to, std::less +#include // std::swap +#include // assert +#include #include // std::initializer_list #include // std::advance #include // std::pair, std::move diff --git a/src/core/json/include/sourcemeta/core/json_value.h b/src/core/json/include/sourcemeta/core/json_value.h index 96b36dbc5..bb7549ae1 100644 --- a/src/core/json/include/sourcemeta/core/json_value.h +++ b/src/core/json/include/sourcemeta/core/json_value.h @@ -1,6 +1,7 @@ #ifndef SOURCEMETA_CORE_JSON_VALUE_H_ #define SOURCEMETA_CORE_JSON_VALUE_H_ +#include #ifndef SOURCEMETA_CORE_JSON_EXPORT #include #endif @@ -15,7 +16,6 @@ #include // std::less, std::reference_wrapper, std::function #include // std::initializer_list #include // std::allocator -#include // std::optional #include // std::set #include // std::basic_istringstream #include // std::basic_string, std::char_traits diff --git a/src/core/json/json.cc b/src/core/json/json.cc index 3479296ac..6004c8bc5 100644 --- a/src/core/json/json.cc +++ b/src/core/json/json.cc @@ -1,10 +1,18 @@ #include "parser.h" +#include "sourcemeta/core/json_error.h" +#include "sourcemeta/core/json_value.h" #include "stringify.h" +#include +#include +#include +#include +#include #include -#include // assert -#include // std::ifstream +#include // assert +#include // std::ifstream +#include #include // std::make_error_code, std::errc namespace sourcemeta::core { diff --git a/src/core/json/json_value.cc b/src/core/json/json_value.cc index 2ae9ca170..075f6353d 100644 --- a/src/core/json/json_value.cc +++ b/src/core/json/json_value.cc @@ -1,13 +1,20 @@ +#include "sourcemeta/core/json_array.h" +#include +#include +#include +#include #include #include // std::find #include // assert #include // std::isinf, std::isnan, std::modf, std::trunc #include // std::transform +#include #include // std::invalid_argument #include // std::to_string -#include // std::move -#include // std::vector +#include +#include // std::move +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/json/parser.h b/src/core/json/parser.h index 86f2e13e9..878460514 100644 --- a/src/core/json/parser.h +++ b/src/core/json/parser.h @@ -2,8 +2,9 @@ #define SOURCEMETA_CORE_JSON_PARSER_H_ #include "grammar.h" +#include "sourcemeta/core/json_value.h" -#include +#include #include #include // assert diff --git a/src/core/json/stringify.h b/src/core/json/stringify.h index 161310516..4c908e30f 100644 --- a/src/core/json/stringify.h +++ b/src/core/json/stringify.h @@ -2,15 +2,19 @@ #define SOURCEMETA_CORE_JSON_STRINGIFY_H_ #include "grammar.h" +#include "sourcemeta/core/json_value.h" -#include +#include +#include #include // std::transform, std::sort #include // std::setprecision #include // std::noshowpoint, std::fixed #include // std::next, std::cbegin, std::cend, std::back_inserter #include // std::basic_ostream -#include // std::to_string +#include +#include // std::to_string +#include namespace sourcemeta::core::internal { constexpr auto LINE_WIDTH{80}; From da3425a26239a6cd9edbc1b2038206f7745313f4 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Wed, 21 May 2025 14:24:31 +0530 Subject: [PATCH 2/3] Address the review comments about include conventions Signed-off-by: Balakrishna Avulapati --- .../json/include/sourcemeta/core/json_error.h | 4 +-- .../include/sourcemeta/core/json_object.h | 2 +- .../json/include/sourcemeta/core/json_value.h | 2 +- src/core/json/json.cc | 22 +++++++------- src/core/json/json_value.cc | 30 +++++++++---------- src/core/json/parser.h | 4 +-- src/core/json/stringify.h | 26 ++++++++-------- 7 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/core/json/include/sourcemeta/core/json_error.h b/src/core/json/include/sourcemeta/core/json_error.h index 899160474..d8a9dbc5a 100644 --- a/src/core/json/include/sourcemeta/core/json_error.h +++ b/src/core/json/include/sourcemeta/core/json_error.h @@ -1,8 +1,6 @@ #ifndef SOURCEMETA_CORE_JSON_ERROR_H_ #define SOURCEMETA_CORE_JSON_ERROR_H_ -#include -#include #ifndef SOURCEMETA_CORE_JSON_EXPORT #include #endif @@ -10,6 +8,8 @@ #include // std::uint64_t #include // std::exception #include // std::filesystem::path +#include // std::string +#include // std::move namespace sourcemeta::core { diff --git a/src/core/json/include/sourcemeta/core/json_object.h b/src/core/json/include/sourcemeta/core/json_object.h index fbd15759d..245c74285 100644 --- a/src/core/json/include/sourcemeta/core/json_object.h +++ b/src/core/json/include/sourcemeta/core/json_object.h @@ -3,7 +3,7 @@ #include // std::swap #include // assert -#include +#include // std::size_t #include // std::initializer_list #include // std::advance #include // std::pair, std::move diff --git a/src/core/json/include/sourcemeta/core/json_value.h b/src/core/json/include/sourcemeta/core/json_value.h index bb7549ae1..ff9a226be 100644 --- a/src/core/json/include/sourcemeta/core/json_value.h +++ b/src/core/json/include/sourcemeta/core/json_value.h @@ -1,7 +1,6 @@ #ifndef SOURCEMETA_CORE_JSON_VALUE_H_ #define SOURCEMETA_CORE_JSON_VALUE_H_ -#include #ifndef SOURCEMETA_CORE_JSON_EXPORT #include #endif @@ -22,6 +21,7 @@ #include // std::basic_string_view #include // std::enable_if_t, std::is_same_v #include // std::pair +#include // std::size_t namespace sourcemeta::core { diff --git a/src/core/json/json.cc b/src/core/json/json.cc index 6004c8bc5..fac29ecd5 100644 --- a/src/core/json/json.cc +++ b/src/core/json/json.cc @@ -1,19 +1,17 @@ #include "parser.h" -#include "sourcemeta/core/json_error.h" -#include "sourcemeta/core/json_value.h" #include "stringify.h" -#include -#include -#include -#include -#include #include - -#include // assert -#include // std::ifstream -#include -#include // std::make_error_code, std::errc +#include +#include + +#include // assert +#include // std::ifstream +#include // std::make_error_code, std::errc +#include // std::uint64_t +#include // std::filesystem +#include // std::basic_istream +#include // std::basic_ostream namespace sourcemeta::core { diff --git a/src/core/json/json_value.cc b/src/core/json/json_value.cc index 075f6353d..3b3967625 100644 --- a/src/core/json/json_value.cc +++ b/src/core/json/json_value.cc @@ -1,20 +1,20 @@ -#include "sourcemeta/core/json_array.h" -#include -#include -#include -#include +#include #include -#include // std::find -#include // assert -#include // std::isinf, std::isnan, std::modf, std::trunc -#include // std::transform -#include -#include // std::invalid_argument -#include // std::to_string -#include -#include // std::move -#include // std::vector +#include // std::find +#include // assert +#include // std::isinf, std::isnan, std::modf, std::trunc +#include // std::transform +#include // std::basic_istringstream +#include // std::invalid_argument +#include // std::to_string +#include // std::basic_string_view +#include // std::move +#include // std::vector +#include // std::size_t +#include // std::int64_t +#include // std::reference_wrapper +#include // std::initializer_list namespace sourcemeta::core { diff --git a/src/core/json/parser.h b/src/core/json/parser.h index 878460514..538afd0c3 100644 --- a/src/core/json/parser.h +++ b/src/core/json/parser.h @@ -2,10 +2,9 @@ #define SOURCEMETA_CORE_JSON_PARSER_H_ #include "grammar.h" -#include "sourcemeta/core/json_value.h" -#include #include +#include #include // assert #include // std::isxdigit @@ -17,6 +16,7 @@ #include // std::stack #include // std::out_of_range #include // std::basic_string, std::stol, std::stod, std::stoul +#include // std::size_t namespace sourcemeta::core::internal { diff --git a/src/core/json/stringify.h b/src/core/json/stringify.h index 4c908e30f..d0c959c78 100644 --- a/src/core/json/stringify.h +++ b/src/core/json/stringify.h @@ -2,19 +2,19 @@ #define SOURCEMETA_CORE_JSON_STRINGIFY_H_ #include "grammar.h" -#include "sourcemeta/core/json_value.h" - -#include -#include - -#include // std::transform, std::sort -#include // std::setprecision -#include // std::noshowpoint, std::fixed -#include // std::next, std::cbegin, std::cend, std::back_inserter -#include // std::basic_ostream -#include -#include // std::to_string -#include + +#include + +#include // std::transform, std::sort +#include // std::setprecision +#include // std::noshowpoint, std::fixed +#include // std::next, std::cbegin, std::cend, std::back_inserter +#include // std::basic_ostream +#include // std::ostringstream +#include // std::to_string +#include // std::vector +#include // std::size_t +#include // std::int64_t namespace sourcemeta::core::internal { constexpr auto LINE_WIDTH{80}; From 565c4a82ac67fc0f5ce0500796e52fae14bfc3af Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Wed, 21 May 2025 14:26:41 +0530 Subject: [PATCH 3/3] Run Clang format Signed-off-by: Balakrishna Avulapati --- .../include/sourcemeta/core/json_object.h | 6 ++-- .../json/include/sourcemeta/core/json_value.h | 2 +- src/core/json/json.cc | 14 +++++----- src/core/json/json_value.cc | 28 +++++++++---------- src/core/json/parser.h | 2 +- src/core/json/stringify.h | 20 ++++++------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/core/json/include/sourcemeta/core/json_object.h b/src/core/json/include/sourcemeta/core/json_object.h index 245c74285..5500a5344 100644 --- a/src/core/json/include/sourcemeta/core/json_object.h +++ b/src/core/json/include/sourcemeta/core/json_object.h @@ -1,9 +1,9 @@ #ifndef SOURCEMETA_CORE_JSON_OBJECT_H_ #define SOURCEMETA_CORE_JSON_OBJECT_H_ -#include // std::swap -#include // assert -#include // std::size_t +#include // std::swap +#include // assert +#include // std::size_t #include // std::initializer_list #include // std::advance #include // std::pair, std::move diff --git a/src/core/json/include/sourcemeta/core/json_value.h b/src/core/json/include/sourcemeta/core/json_value.h index ff9a226be..f3f673d99 100644 --- a/src/core/json/include/sourcemeta/core/json_value.h +++ b/src/core/json/include/sourcemeta/core/json_value.h @@ -11,6 +11,7 @@ #include // std::any_of #include // assert +#include // std::size_t #include // std::int64_t, std::uint8_t #include // std::less, std::reference_wrapper, std::function #include // std::initializer_list @@ -21,7 +22,6 @@ #include // std::basic_string_view #include // std::enable_if_t, std::is_same_v #include // std::pair -#include // std::size_t namespace sourcemeta::core { diff --git a/src/core/json/json.cc b/src/core/json/json.cc index fac29ecd5..6e420882b 100644 --- a/src/core/json/json.cc +++ b/src/core/json/json.cc @@ -5,13 +5,13 @@ #include #include -#include // assert -#include // std::ifstream -#include // std::make_error_code, std::errc -#include // std::uint64_t -#include // std::filesystem -#include // std::basic_istream -#include // std::basic_ostream +#include // assert +#include // std::uint64_t +#include // std::filesystem +#include // std::ifstream +#include // std::basic_istream +#include // std::basic_ostream +#include // std::make_error_code, std::errc namespace sourcemeta::core { diff --git a/src/core/json/json_value.cc b/src/core/json/json_value.cc index 3b3967625..1796a507c 100644 --- a/src/core/json/json_value.cc +++ b/src/core/json/json_value.cc @@ -1,20 +1,20 @@ #include #include -#include // std::find -#include // assert -#include // std::isinf, std::isnan, std::modf, std::trunc -#include // std::transform -#include // std::basic_istringstream -#include // std::invalid_argument -#include // std::to_string -#include // std::basic_string_view -#include // std::move -#include // std::vector -#include // std::size_t -#include // std::int64_t -#include // std::reference_wrapper -#include // std::initializer_list +#include // std::find +#include // assert +#include // std::isinf, std::isnan, std::modf, std::trunc +#include // std::size_t +#include // std::int64_t +#include // std::reference_wrapper +#include // std::initializer_list +#include // std::transform +#include // std::basic_istringstream +#include // std::invalid_argument +#include // std::to_string +#include // std::basic_string_view +#include // std::move +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/json/parser.h b/src/core/json/parser.h index 538afd0c3..f7def1e47 100644 --- a/src/core/json/parser.h +++ b/src/core/json/parser.h @@ -8,6 +8,7 @@ #include // assert #include // std::isxdigit +#include // std::size_t #include // std::uint64_t #include // std::reference_wrapper #include // std::basic_istream @@ -16,7 +17,6 @@ #include // std::stack #include // std::out_of_range #include // std::basic_string, std::stol, std::stod, std::stoul -#include // std::size_t namespace sourcemeta::core::internal { diff --git a/src/core/json/stringify.h b/src/core/json/stringify.h index d0c959c78..4e5b1b020 100644 --- a/src/core/json/stringify.h +++ b/src/core/json/stringify.h @@ -5,16 +5,16 @@ #include -#include // std::transform, std::sort -#include // std::setprecision -#include // std::noshowpoint, std::fixed -#include // std::next, std::cbegin, std::cend, std::back_inserter -#include // std::basic_ostream -#include // std::ostringstream -#include // std::to_string -#include // std::vector -#include // std::size_t -#include // std::int64_t +#include // std::transform, std::sort +#include // std::size_t +#include // std::int64_t +#include // std::setprecision +#include // std::noshowpoint, std::fixed +#include // std::next, std::cbegin, std::cend, std::back_inserter +#include // std::basic_ostream +#include // std::ostringstream +#include // std::to_string +#include // std::vector namespace sourcemeta::core::internal { constexpr auto LINE_WIDTH{80};