From 4e23031bea4fb6109aa619cdf1b9aa93b5cf84e5 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Thu, 22 May 2025 00:24:30 +0530 Subject: [PATCH 1/6] style(clang-tidy): Clean include headers of src/core/jsonschema Reported by clang-tidy check misc-include-cleaner Refs: sourcemeta/blaze#429 Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/bundle.cc | 16 +++++++++---- src/core/jsonschema/frame.cc | 10 ++++++++ .../include/sourcemeta/core/jsonschema.h | 10 ++------ .../sourcemeta/core/jsonschema_error.h | 8 +++---- .../sourcemeta/core/jsonschema_frame.h | 23 ++++++++----------- .../sourcemeta/core/jsonschema_resolver.h | 2 ++ .../sourcemeta/core/jsonschema_transform.h | 5 ++-- .../sourcemeta/core/jsonschema_types.h | 1 + .../sourcemeta/core/jsonschema_walker.h | 11 ++++----- src/core/jsonschema/jsonschema.cc | 11 +++++++++ src/core/jsonschema/official_resolver.in.cc | 4 ++++ src/core/jsonschema/official_walker.cc | 2 ++ src/core/jsonschema/resolver.cc | 22 ++++++++++++++---- src/core/jsonschema/transformer.cc | 8 +++++++ src/core/jsonschema/walker.cc | 10 ++++++++ src/extension/alterschema/alterschema.cc | 1 + .../include/sourcemeta/core/alterschema.h | 1 + .../jsonschema_base_dialect_test.cc | 1 + .../jsonschema_bundle_2019_09_test.cc | 1 + .../jsonschema_bundle_2020_12_test.cc | 1 + .../jsonschema_bundle_draft0_test.cc | 1 + .../jsonschema_bundle_draft1_test.cc | 1 + .../jsonschema_bundle_draft2_test.cc | 1 + .../jsonschema_bundle_draft3_test.cc | 1 + .../jsonschema_bundle_draft4_test.cc | 1 + .../jsonschema_bundle_draft6_test.cc | 1 + .../jsonschema_bundle_draft7_test.cc | 1 + test/jsonschema/jsonschema_bundle_test.cc | 1 + test/jsonschema/jsonschema_error_test.cc | 1 + .../jsonschema_flat_file_resolver_test.cc | 2 ++ test/jsonschema/jsonschema_format_test.cc | 1 + .../jsonschema_frame_2019_09_test.cc | 1 + .../jsonschema_frame_2020_12_test.cc | 1 + .../jsonschema_frame_draft0_test.cc | 1 + .../jsonschema_frame_draft1_test.cc | 1 + .../jsonschema_frame_draft2_test.cc | 1 + .../jsonschema_frame_draft3_test.cc | 1 + .../jsonschema_frame_draft4_test.cc | 1 + .../jsonschema_frame_draft6_test.cc | 1 + .../jsonschema_frame_draft7_test.cc | 1 + test/jsonschema/jsonschema_frame_test.cc | 1 + test/jsonschema/jsonschema_identify_test.cc | 1 + .../jsonschema_keyword_iterator_test.cc | 1 + .../jsonschema_map_resolver_test.cc | 3 +++ test/jsonschema/jsonschema_metaschema_test.cc | 1 + ...jsonschema_official_walker_2019_09_test.cc | 2 ++ ...jsonschema_official_walker_2020_12_test.cc | 2 ++ .../jsonschema_official_walker_draft0_test.cc | 2 ++ .../jsonschema_official_walker_draft1_test.cc | 2 ++ .../jsonschema_official_walker_draft2_test.cc | 2 ++ .../jsonschema_official_walker_draft3_test.cc | 2 ++ .../jsonschema_official_walker_draft4_test.cc | 2 ++ .../jsonschema_official_walker_draft6_test.cc | 2 ++ .../jsonschema_official_walker_draft7_test.cc | 2 ++ test/jsonschema/jsonschema_relativize_test.cc | 1 + test/jsonschema/jsonschema_transform_rules.h | 1 + .../jsonschema/jsonschema_transformer_test.cc | 1 + .../jsonschema_vocabulary_2020_12_test.cc | 1 + test/jsonschema/jsonschema_vocabulary_test.cc | 1 + test/jsonschema/jsonschema_walker_test.cc | 1 + test/jsonschema/jsonschema_wrap_test.cc | 1 + 61 files changed, 156 insertions(+), 45 deletions(-) diff --git a/src/core/jsonschema/bundle.cc b/src/core/jsonschema/bundle.cc index 72eeb86b2..6ff77d092 100644 --- a/src/core/jsonschema/bundle.cc +++ b/src/core/jsonschema/bundle.cc @@ -1,8 +1,16 @@ +#include +#include #include - -#include // assert -#include // std::ostringstream -#include // std::move +#include +#include +#include + +#include // assert +#include // std::size_t +#include //std::nullopt +#include // std::ostringstream +#include // std::string +#include // std::move namespace { diff --git a/src/core/jsonschema/frame.cc b/src/core/jsonschema/frame.cc index baa387682..c5f68b2d5 100644 --- a/src/core/jsonschema/frame.cc +++ b/src/core/jsonschema/frame.cc @@ -1,10 +1,20 @@ +#include +#include #include +#include +#include +#include +#include +#include #include // std::sort, std::all_of, std::any_of #include // assert +#include // std::size_t +#include // std::uint8_t #include // std::less #include // std::map #include // std::optional +#include // std::ostream #include // std::set #include // std::ostringstream #include // std::pair, std::move diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h index 1297c4abc..920bfe6cb 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h @@ -5,20 +5,14 @@ #include #endif -#include +#include #include - -#include #include -#include -#include #include -#include +#include #include // std::uint8_t -#include // std::function #include // std::optional, std::nullopt -#include // std::set #include // std::string #include // std::string_view diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h index c7041ef85..55eea3fd6 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_error.h @@ -6,11 +6,11 @@ #endif #include -#include -#include // std::exception -#include // std::string -#include // std::move +#include // std::exception +#include // std::string +#include // std::string_view +#include // std::move namespace sourcemeta::core { diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h index b24524366..edeffc100 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_frame.h @@ -5,23 +5,18 @@ #include #endif -#include +#include #include - -#include #include -#include -#include // std::uint8_t -#include // std::reference_wrapper -#include // std::map -#include // std::optional -#include // std::ostream -#include // std::set -#include // std::tuple -#include // std::unordered_set -#include // std::pair -#include // std::vector +#include // std::uint8_t +#include // std::reference_wrapper +#include // std::map +#include // std::optional +#include // std::ostream +#include // std::set +#include // std::pair +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h index 05e83f38a..4ab8f92ee 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_resolver.h @@ -6,12 +6,14 @@ #endif #include +#include #include #include // std::filesystem #include // std::function #include // std::map #include // std::optional +#include // std::string #include // std::string_view namespace sourcemeta::core { diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h index 74b872545..7363eff9f 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h @@ -5,11 +5,12 @@ #include #endif -#include +#include #include #include #include +#include #include // assert #include // std::derived_from @@ -17,12 +18,10 @@ #include // std::map #include // std::make_unique, std::unique_ptr #include // std::optional, std::nullopt -#include // std::set #include // std::string #include // std::string_view #include // std::move, std::forward, std::pair #include // std::variant -#include // std::vector namespace sourcemeta::core { diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h index b723bc39c..f7ea3a297 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h @@ -2,6 +2,7 @@ #define SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_ #include +#include #include #include diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h index 8bc87e1b6..d78a92373 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_walker.h @@ -5,15 +5,12 @@ #include #endif -#include - +#include #include -#include // std::uint64_t -#include // std::optional -#include // std::string -#include // std::string_view -#include // std::vector +#include // std::optional +#include // std::string +#include // std::vector namespace sourcemeta::core { diff --git a/src/core/jsonschema/jsonschema.cc b/src/core/jsonschema/jsonschema.cc index a947ab561..a32c5ca3f 100644 --- a/src/core/jsonschema/jsonschema.cc +++ b/src/core/jsonschema/jsonschema.cc @@ -1,11 +1,22 @@ +#include +#include #include +#include +#include +#include +#include +#include #include // assert #include // std::uint64_t #include // std::less #include // std::numeric_limits +#include // std::map #include // std::accumulate +#include // std::optional #include // std::ostringstream +#include // std::string +#include // std::string_view #include // std::remove_reference_t #include // std::move diff --git a/src/core/jsonschema/official_resolver.in.cc b/src/core/jsonschema/official_resolver.in.cc index 3b4bdf415..50bfcf2c0 100644 --- a/src/core/jsonschema/official_resolver.in.cc +++ b/src/core/jsonschema/official_resolver.in.cc @@ -1,4 +1,8 @@ +#include // std::optional +#include +#include #include +#include // std::string_view auto sourcemeta::core::schema_official_resolver(std::string_view identifier) -> std::optional { diff --git a/src/core/jsonschema/official_walker.cc b/src/core/jsonschema/official_walker.cc index 65afea448..1c6934aad 100644 --- a/src/core/jsonschema/official_walker.cc +++ b/src/core/jsonschema/official_walker.cc @@ -1,5 +1,7 @@ #include +#include // std::string_view + auto sourcemeta::core::schema_official_walker( std::string_view keyword, const sourcemeta::core::Vocabularies &vocabularies) diff --git a/src/core/jsonschema/resolver.cc b/src/core/jsonschema/resolver.cc index 13e5759a9..edd7b2d82 100644 --- a/src/core/jsonschema/resolver.cc +++ b/src/core/jsonschema/resolver.cc @@ -1,9 +1,21 @@ +#include +#include #include - -#include // std::transform -#include // assert -#include // std::tolower -#include // std::ostringstream +#include +#include +#include +#include + +#include // std::transform +#include // assert +#include // std::tolower +#include // std::filesystem +#include // std::function +#include // std::optional +#include // std::ostringstream +#include // std::string +#include // std::string_view +#include // std::move namespace sourcemeta::core { diff --git a/src/core/jsonschema/transformer.cc b/src/core/jsonschema/transformer.cc index 9c7d401c9..ae5c7721b 100644 --- a/src/core/jsonschema/transformer.cc +++ b/src/core/jsonschema/transformer.cc @@ -1,9 +1,17 @@ +#include +#include #include +#include +#include +#include +#include #include // assert +#include // std::optional #include // std::set #include // std::ostringstream #include // std::runtime_error +#include // std::string #include // std::move, std::pair namespace { diff --git a/src/core/jsonschema/walker.cc b/src/core/jsonschema/walker.cc index ec5492831..f7386cd4c 100644 --- a/src/core/jsonschema/walker.cc +++ b/src/core/jsonschema/walker.cc @@ -1,7 +1,17 @@ +#include +#include #include +#include +#include #include // std::max, std::sort #include // assert +#include // std::size_t +#include // std::uint8_t +#include // std::optional +#include // std::string +#include // std::move +#include // std::vector namespace { enum class SchemaWalkerType_t : std::uint8_t { Deep, Flat }; diff --git a/src/extension/alterschema/alterschema.cc b/src/extension/alterschema/alterschema.cc index 30cdc7691..788f29784 100644 --- a/src/extension/alterschema/alterschema.cc +++ b/src/extension/alterschema/alterschema.cc @@ -1,4 +1,5 @@ #include +#include #include // assert diff --git a/src/extension/alterschema/include/sourcemeta/core/alterschema.h b/src/extension/alterschema/include/sourcemeta/core/alterschema.h index 8c4bf3e5d..46c338774 100644 --- a/src/extension/alterschema/include/sourcemeta/core/alterschema.h +++ b/src/extension/alterschema/include/sourcemeta/core/alterschema.h @@ -15,6 +15,7 @@ #endif #include +#include namespace sourcemeta::core { diff --git a/test/jsonschema/jsonschema_base_dialect_test.cc b/test/jsonschema/jsonschema_base_dialect_test.cc index 048adb415..c4bbf96f9 100644 --- a/test/jsonschema/jsonschema_base_dialect_test.cc +++ b/test/jsonschema/jsonschema_base_dialect_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string diff --git a/test/jsonschema/jsonschema_bundle_2019_09_test.cc b/test/jsonschema/jsonschema_bundle_2019_09_test.cc index f64f0c355..c0e33a240 100644 --- a/test/jsonschema/jsonschema_bundle_2019_09_test.cc +++ b/test/jsonschema/jsonschema_bundle_2019_09_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_2020_12_test.cc b/test/jsonschema/jsonschema_bundle_2020_12_test.cc index e06205753..eb17dd1c9 100644 --- a/test/jsonschema/jsonschema_bundle_2020_12_test.cc +++ b/test/jsonschema/jsonschema_bundle_2020_12_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft0_test.cc b/test/jsonschema/jsonschema_bundle_draft0_test.cc index 46066124f..9a332007c 100644 --- a/test/jsonschema/jsonschema_bundle_draft0_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft0_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft1_test.cc b/test/jsonschema/jsonschema_bundle_draft1_test.cc index 63f590c45..2d409d9a8 100644 --- a/test/jsonschema/jsonschema_bundle_draft1_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft1_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft2_test.cc b/test/jsonschema/jsonschema_bundle_draft2_test.cc index 59eeafbb1..c460303af 100644 --- a/test/jsonschema/jsonschema_bundle_draft2_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft2_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft3_test.cc b/test/jsonschema/jsonschema_bundle_draft3_test.cc index af014f2a0..b69689202 100644 --- a/test/jsonschema/jsonschema_bundle_draft3_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft3_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft4_test.cc b/test/jsonschema/jsonschema_bundle_draft4_test.cc index 1891ff525..37b53b285 100644 --- a/test/jsonschema/jsonschema_bundle_draft4_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft4_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft6_test.cc b/test/jsonschema/jsonschema_bundle_draft6_test.cc index 46fb51097..ca83bcc0a 100644 --- a/test/jsonschema/jsonschema_bundle_draft6_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft6_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_draft7_test.cc b/test/jsonschema/jsonschema_bundle_draft7_test.cc index c38dc0912..e3b2fedb2 100644 --- a/test/jsonschema/jsonschema_bundle_draft7_test.cc +++ b/test/jsonschema/jsonschema_bundle_draft7_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_bundle_test.cc b/test/jsonschema/jsonschema_bundle_test.cc index 1d2942feb..def10cf2a 100644 --- a/test/jsonschema/jsonschema_bundle_test.cc +++ b/test/jsonschema/jsonschema_bundle_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string #include // std::string_view diff --git a/test/jsonschema/jsonschema_error_test.cc b/test/jsonschema/jsonschema_error_test.cc index 81c888dc1..eca887be0 100644 --- a/test/jsonschema/jsonschema_error_test.cc +++ b/test/jsonschema/jsonschema_error_test.cc @@ -1,6 +1,7 @@ #include #include +#include #include // std::exception #include // std::string diff --git a/test/jsonschema/jsonschema_flat_file_resolver_test.cc b/test/jsonschema/jsonschema_flat_file_resolver_test.cc index 49159ab2e..f8a779ebf 100644 --- a/test/jsonschema/jsonschema_flat_file_resolver_test.cc +++ b/test/jsonschema/jsonschema_flat_file_resolver_test.cc @@ -1,6 +1,8 @@ #include #include +#include +#include TEST(JSONSchema_SchemaFlatFileResolver, empty_no_fallback) { sourcemeta::core::SchemaFlatFileResolver resolver; diff --git a/test/jsonschema/jsonschema_format_test.cc b/test/jsonschema/jsonschema_format_test.cc index d53b421d0..a24d38459 100644 --- a/test/jsonschema/jsonschema_format_test.cc +++ b/test/jsonschema/jsonschema_format_test.cc @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/test/jsonschema/jsonschema_frame_2019_09_test.cc b/test/jsonschema/jsonschema_frame_2019_09_test.cc index 44c21d2ae..253352569 100644 --- a/test/jsonschema/jsonschema_frame_2019_09_test.cc +++ b/test/jsonschema/jsonschema_frame_2019_09_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_2020_12_test.cc b/test/jsonschema/jsonschema_frame_2020_12_test.cc index fbeda375b..88733ae90 100644 --- a/test/jsonschema/jsonschema_frame_2020_12_test.cc +++ b/test/jsonschema/jsonschema_frame_2020_12_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft0_test.cc b/test/jsonschema/jsonschema_frame_draft0_test.cc index d8af0b414..e18dede24 100644 --- a/test/jsonschema/jsonschema_frame_draft0_test.cc +++ b/test/jsonschema/jsonschema_frame_draft0_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft1_test.cc b/test/jsonschema/jsonschema_frame_draft1_test.cc index e39149acd..1fa9b95ba 100644 --- a/test/jsonschema/jsonschema_frame_draft1_test.cc +++ b/test/jsonschema/jsonschema_frame_draft1_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft2_test.cc b/test/jsonschema/jsonschema_frame_draft2_test.cc index 69d85e52d..5194f9c32 100644 --- a/test/jsonschema/jsonschema_frame_draft2_test.cc +++ b/test/jsonschema/jsonschema_frame_draft2_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft3_test.cc b/test/jsonschema/jsonschema_frame_draft3_test.cc index c633fd97c..7629c35af 100644 --- a/test/jsonschema/jsonschema_frame_draft3_test.cc +++ b/test/jsonschema/jsonschema_frame_draft3_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft4_test.cc b/test/jsonschema/jsonschema_frame_draft4_test.cc index 8aff462d7..5e5714fbf 100644 --- a/test/jsonschema/jsonschema_frame_draft4_test.cc +++ b/test/jsonschema/jsonschema_frame_draft4_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft6_test.cc b/test/jsonschema/jsonschema_frame_draft6_test.cc index 93a0a4c6d..138a1166b 100644 --- a/test/jsonschema/jsonschema_frame_draft6_test.cc +++ b/test/jsonschema/jsonschema_frame_draft6_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_draft7_test.cc b/test/jsonschema/jsonschema_frame_draft7_test.cc index 1a9801784..6586c3c79 100644 --- a/test/jsonschema/jsonschema_frame_draft7_test.cc +++ b/test/jsonschema/jsonschema_frame_draft7_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_frame_test.cc b/test/jsonschema/jsonschema_frame_test.cc index 0feff574a..ac6432f48 100644 --- a/test/jsonschema/jsonschema_frame_test.cc +++ b/test/jsonschema/jsonschema_frame_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include #include diff --git a/test/jsonschema/jsonschema_identify_test.cc b/test/jsonschema/jsonschema_identify_test.cc index ad292345c..4cfb569bc 100644 --- a/test/jsonschema/jsonschema_identify_test.cc +++ b/test/jsonschema/jsonschema_identify_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONSchema_identify, boolean_no_dialect) { const sourcemeta::core::JSON document{true}; diff --git a/test/jsonschema/jsonschema_keyword_iterator_test.cc b/test/jsonschema/jsonschema_keyword_iterator_test.cc index 6b118d437..e73fdb65f 100644 --- a/test/jsonschema/jsonschema_keyword_iterator_test.cc +++ b/test/jsonschema/jsonschema_keyword_iterator_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include diff --git a/test/jsonschema/jsonschema_map_resolver_test.cc b/test/jsonschema/jsonschema_map_resolver_test.cc index cd837dbb0..21e7fc5ee 100644 --- a/test/jsonschema/jsonschema_map_resolver_test.cc +++ b/test/jsonschema/jsonschema_map_resolver_test.cc @@ -1,6 +1,9 @@ #include +#include #include +#include +#include #include diff --git a/test/jsonschema/jsonschema_metaschema_test.cc b/test/jsonschema/jsonschema_metaschema_test.cc index a3a122e62..4fdf9a2f9 100644 --- a/test/jsonschema/jsonschema_metaschema_test.cc +++ b/test/jsonschema/jsonschema_metaschema_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONSchema_metaschema, example_2020_12) { const auto schema{sourcemeta::core::parse_json(R"JSON({ diff --git a/test/jsonschema/jsonschema_official_walker_2019_09_test.cc b/test/jsonschema/jsonschema_official_walker_2019_09_test.cc index f511c287d..ec359947a 100644 --- a/test/jsonschema/jsonschema_official_walker_2019_09_test.cc +++ b/test/jsonschema/jsonschema_official_walker_2019_09_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include diff --git a/test/jsonschema/jsonschema_official_walker_2020_12_test.cc b/test/jsonschema/jsonschema_official_walker_2020_12_test.cc index 0338edfc2..9680ea56c 100644 --- a/test/jsonschema/jsonschema_official_walker_2020_12_test.cc +++ b/test/jsonschema/jsonschema_official_walker_2020_12_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include diff --git a/test/jsonschema/jsonschema_official_walker_draft0_test.cc b/test/jsonschema/jsonschema_official_walker_draft0_test.cc index 7d077344f..3609a6c42 100644 --- a/test/jsonschema/jsonschema_official_walker_draft0_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft0_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft1_test.cc b/test/jsonschema/jsonschema_official_walker_draft1_test.cc index c605edca6..d918b0e6f 100644 --- a/test/jsonschema/jsonschema_official_walker_draft1_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft1_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft2_test.cc b/test/jsonschema/jsonschema_official_walker_draft2_test.cc index 528103905..5845127c9 100644 --- a/test/jsonschema/jsonschema_official_walker_draft2_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft2_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft3_test.cc b/test/jsonschema/jsonschema_official_walker_draft3_test.cc index 23bb9ee73..d1b3166f0 100644 --- a/test/jsonschema/jsonschema_official_walker_draft3_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft3_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft4_test.cc b/test/jsonschema/jsonschema_official_walker_draft4_test.cc index b85a8f695..69d259299 100644 --- a/test/jsonschema/jsonschema_official_walker_draft4_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft4_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft6_test.cc b/test/jsonschema/jsonschema_official_walker_draft6_test.cc index 6c9ee385a..80ebae0d5 100644 --- a/test/jsonschema/jsonschema_official_walker_draft6_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft6_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_official_walker_draft7_test.cc b/test/jsonschema/jsonschema_official_walker_draft7_test.cc index 9d3456fe1..b2f121ad5 100644 --- a/test/jsonschema/jsonschema_official_walker_draft7_test.cc +++ b/test/jsonschema/jsonschema_official_walker_draft7_test.cc @@ -1,6 +1,8 @@ #include +#include #include +#include #include "jsonschema_test_utils.h" diff --git a/test/jsonschema/jsonschema_relativize_test.cc b/test/jsonschema/jsonschema_relativize_test.cc index 95e1da8db..ad93bf1e2 100644 --- a/test/jsonschema/jsonschema_relativize_test.cc +++ b/test/jsonschema/jsonschema_relativize_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONSchema_relativize, draft4_1) { auto schema = sourcemeta::core::parse_json(R"JSON({ diff --git a/test/jsonschema/jsonschema_transform_rules.h b/test/jsonschema/jsonschema_transform_rules.h index 95a34ef03..017ee6616 100644 --- a/test/jsonschema/jsonschema_transform_rules.h +++ b/test/jsonschema/jsonschema_transform_rules.h @@ -2,6 +2,7 @@ #define SOURCEMETA_CORE_JSONSCHEMA_TEST_TRANSFORM_RULES_H_ #include +#include class ExampleRule1 final : public sourcemeta::core::SchemaTransformRule { public: diff --git a/test/jsonschema/jsonschema_transformer_test.cc b/test/jsonschema/jsonschema_transformer_test.cc index 90feacd03..4a6c27c89 100644 --- a/test/jsonschema/jsonschema_transformer_test.cc +++ b/test/jsonschema/jsonschema_transformer_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include #include diff --git a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc index 60bbe34b3..4a8dfa58a 100644 --- a/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc +++ b/test/jsonschema/jsonschema_vocabulary_2020_12_test.cc @@ -2,6 +2,7 @@ #include #include +#include #include // std::string diff --git a/test/jsonschema/jsonschema_vocabulary_test.cc b/test/jsonschema/jsonschema_vocabulary_test.cc index bb2ffd576..b70d226be 100644 --- a/test/jsonschema/jsonschema_vocabulary_test.cc +++ b/test/jsonschema/jsonschema_vocabulary_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONSchema_vocabulary, core_vocabularies_boolean_without_default) { const sourcemeta::core::JSON document{true}; diff --git a/test/jsonschema/jsonschema_walker_test.cc b/test/jsonschema/jsonschema_walker_test.cc index 0d792b347..dd26197c7 100644 --- a/test/jsonschema/jsonschema_walker_test.cc +++ b/test/jsonschema/jsonschema_walker_test.cc @@ -3,6 +3,7 @@ #include #include #include +#include #include diff --git a/test/jsonschema/jsonschema_wrap_test.cc b/test/jsonschema/jsonschema_wrap_test.cc index c5bc3ffdd..9a664d2ec 100644 --- a/test/jsonschema/jsonschema_wrap_test.cc +++ b/test/jsonschema/jsonschema_wrap_test.cc @@ -2,6 +2,7 @@ #include #include +#include TEST(JSONSchema_wrap, identifier_without_fragment) { const auto identifier{"https://www.example.com"}; From 2ab35b6c3a6e32a43939310ee33fe0d5ed16c060 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Thu, 22 May 2025 00:54:13 +0530 Subject: [PATCH 2/6] Update src/core/jsonschema/bundle.cc Co-authored-by: Juan Cruz Viotti Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/bundle.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/jsonschema/bundle.cc b/src/core/jsonschema/bundle.cc index 6ff77d092..a294ce731 100644 --- a/src/core/jsonschema/bundle.cc +++ b/src/core/jsonschema/bundle.cc @@ -7,7 +7,7 @@ #include // assert #include // std::size_t -#include //std::nullopt +#include // std::nullopt #include // std::ostringstream #include // std::string #include // std::move From c5b3460461f086d7f10b0fe40c012d768d84a3e2 Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Thu, 22 May 2025 01:01:33 +0530 Subject: [PATCH 3/6] Order the includes Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/official_resolver.in.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/jsonschema/official_resolver.in.cc b/src/core/jsonschema/official_resolver.in.cc index 50bfcf2c0..1ab8a11de 100644 --- a/src/core/jsonschema/official_resolver.in.cc +++ b/src/core/jsonschema/official_resolver.in.cc @@ -1,7 +1,8 @@ -#include // std::optional #include #include #include + +#include // std::optional #include // std::string_view auto sourcemeta::core::schema_official_resolver(std::string_view identifier) From 2057245c5412555f0467e13a0079dd9ad55e45ac Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Fri, 23 May 2025 19:37:53 +0530 Subject: [PATCH 4/6] fix lint errors Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/frame.cc | 1 + .../jsonschema/include/sourcemeta/core/jsonschema_transform.h | 4 +--- .../jsonschema/include/sourcemeta/core/jsonschema_types.h | 1 - src/core/jsonschema/official_walker.cc | 2 ++ src/core/jsonschema/transformer.cc | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/core/jsonschema/frame.cc b/src/core/jsonschema/frame.cc index c5f68b2d5..9dc29beb9 100644 --- a/src/core/jsonschema/frame.cc +++ b/src/core/jsonschema/frame.cc @@ -12,6 +12,7 @@ #include // std::size_t #include // std::uint8_t #include // std::less +#include // std::next #include // std::map #include // std::optional #include // std::ostream diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h index 7363eff9f..183e5c4c9 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_transform.h @@ -7,9 +7,7 @@ #include #include -#include - -#include +#include #include #include // assert diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h index f7ea3a297..d9f14b506 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema_types.h @@ -1,7 +1,6 @@ #ifndef SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_ #define SOURCEMETA_CORE_JSONSCHEMA_TYPES_H_ -#include #include #include #include diff --git a/src/core/jsonschema/official_walker.cc b/src/core/jsonschema/official_walker.cc index 1c6934aad..c9ac5eb0a 100644 --- a/src/core/jsonschema/official_walker.cc +++ b/src/core/jsonschema/official_walker.cc @@ -1,5 +1,7 @@ #include +#include +#include // std::nullopt #include // std::string_view auto sourcemeta::core::schema_official_walker( diff --git a/src/core/jsonschema/transformer.cc b/src/core/jsonschema/transformer.cc index ae5c7721b..8664fa5cf 100644 --- a/src/core/jsonschema/transformer.cc +++ b/src/core/jsonschema/transformer.cc @@ -13,6 +13,7 @@ #include // std::runtime_error #include // std::string #include // std::move, std::pair +#include // std::holds_alternative, std::get_if namespace { From 4525de96f7c683d532361c94ac48a7dd1eedb95f Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Fri, 23 May 2025 19:53:15 +0530 Subject: [PATCH 5/6] Use NOLINT Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/include/sourcemeta/core/jsonschema.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h index 920bfe6cb..313d2ee3f 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h @@ -5,6 +5,7 @@ #include #endif +#include // NOLINT(misc-include-cleaner) Public header needs it #include #include #include From 22f261894243c0751429ec46a62aa1d2da6b850d Mon Sep 17 00:00:00 2001 From: Balakrishna Avulapati Date: Fri, 23 May 2025 20:55:13 +0530 Subject: [PATCH 6/6] Use NOLINT for all the private headers of a public header Ref: https://github.com/sourcemeta/core/pull/1650/files#r2104799191 "Essentially, for a header X.h, then don't clean its X_.h includes" Signed-off-by: Balakrishna Avulapati --- src/core/jsonschema/include/sourcemeta/core/jsonschema.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h index 313d2ee3f..76bbaee44 100644 --- a/src/core/jsonschema/include/sourcemeta/core/jsonschema.h +++ b/src/core/jsonschema/include/sourcemeta/core/jsonschema.h @@ -8,8 +8,15 @@ #include // NOLINT(misc-include-cleaner) Public header needs it #include #include + +// NOLINTBEGIN(misc-include-cleaner) +#include #include +#include #include +#include +// NOLINTEND(misc-include-cleaner) + #include #include // std::uint8_t