Skip to content

style(clang-tidy): Clean include headers of src/core/jsonpointer #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2025
Merged

style(clang-tidy): Clean include headers of src/core/jsonpointer #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1521f71
style(clang-tidy): Clean include headers of src/core/jsonpointer
bavulapati May 18, 2025
71ccd1d
Address review comments about include conventions
bavulapati May 21, 2025
5740a88
fix missed file
bavulapati May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
#include <sourcemeta/core/jsonpointer_export.h>
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/uri.h>

#include <sourcemeta/core/json_hash.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_error.h>
#include <sourcemeta/core/jsonpointer_pointer.h>
#include <sourcemeta/core/jsonpointer_position.h>
#include <sourcemeta/core/jsonpointer_subpointer_walker.h>
#include <sourcemeta/core/jsonpointer_template.h>
#include <sourcemeta/core/jsonpointer_walker.h>
Expand Down
2 changes: 1 addition & 1 deletion src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#include <algorithm> // std::copy, std::equal
#include <cassert> // assert
#include <cstddef> // std::size_t
#include <functional> // std::reference_wrapper
#include <initializer_list> // std::initializer_list
#include <iterator> // std::advance, std::back_inserter
#include <sstream> // std::basic_ostringstream
#include <type_traits> // std::enable_if_t, std::is_same_v
#include <utility> // std::move
#include <vector> // std::vector
Expand Down
4 changes: 3 additions & 1 deletion src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
#include <sourcemeta/core/jsonpointer_export.h>
#endif

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_hash.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer_pointer.h>

#include <cstddef> // std::size_t
#include <cstdint> // std::uint64_t
#include <map> // std::map
#include <optional> // std::optional
Expand Down
2 changes: 0 additions & 2 deletions src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#include <cstddef> // std::ptrdiff_t
#include <iterator> // std::forward_iterator_tag

#include <sourcemeta/core/jsonpointer_pointer.h>

namespace sourcemeta::core {

/// @ingroup jsonpointer
Expand Down
16 changes: 7 additions & 9 deletions src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
#ifndef SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_
#define SOURCEMETA_CORE_JSONPOINTER_TEMPLATE_H_

#include <sourcemeta/core/jsonpointer_pointer.h>
#include <sourcemeta/core/jsonpointer_token.h>

#include <sourcemeta/core/regex.h>

#include <algorithm> // std::copy, std::all_of
#include <cassert> // assert
#include <iterator> // std::back_inserter
#include <optional> // std::optional, std::nullopt
#include <variant> // std::variant, std::holds_alternative, std::get
#include <vector> // std::vector
#include <algorithm> // std::copy, std::all_of
#include <cassert> // assert
#include <initializer_list> // std::initializer_list
#include <iterator> // std::back_inserter
#include <optional> // std::optional, std::nullopt
#include <variant> // std::variant, std::holds_alternative, std::get
#include <vector> // std::vector

namespace sourcemeta::core {

Expand Down
2 changes: 1 addition & 1 deletion src/core/jsonpointer/include/sourcemeta/core/jsonpointer_token.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_
#define SOURCEMETA_CORE_JSONPOINTER_TOKEN_H_

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_value.h>

#include <cassert> // assert

Expand Down
6 changes: 3 additions & 3 deletions src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef SOURCEMETA_CORE_JSONPOINTER_WALKER_H_
#define SOURCEMETA_CORE_JSONPOINTER_WALKER_H_

#include <vector> // std::vector
#include <sourcemeta/core/json_value.h>

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer_pointer.h>
#include <cstddef> // std::size_t
#include <vector> // std::vector

namespace sourcemeta::core {

Expand Down
8 changes: 7 additions & 1 deletion src/core/jsonpointer/jsonpointer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_hash.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_pointer.h>
#include <sourcemeta/core/uri.h>

#include "grammar.h"
#include "parser.h"
#include "stringify.h"

#include <cassert> // assert
#include <functional> // std::reference_wrapper
#include <iterator> // std::cbegin, std::cend, std::prev
#include <memory> // std::allocator
#include <ostream> // std::basic_ostream
#include <sstream> // std::basic_ostringstream, std::basic_stringstream
#include <string> // std::basic_string
#include <type_traits> // std::is_same_v
#include <utility> // std::move

Expand Down
4 changes: 3 additions & 1 deletion src/core/jsonpointer/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@

#include "grammar.h"

#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_error.h>
#include <sourcemeta/core/jsonpointer_pointer.h>

#include <cstdint> // std::uint64_t
#include <istream> // std::basic_istream
#include <sstream> // std::basic_stringstream
#include <stdexcept> // std::out_of_range
Expand Down
6 changes: 5 additions & 1 deletion src/core/jsonpointer/position.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/jsonpointer_position.h>

#include <cassert> // assert
#include <cassert> // assert
#include <cstddef> // std::size_t
#include <cstdint> // std::uint64_t
#include <optional> // std::optional

namespace sourcemeta::core {

Expand Down
6 changes: 4 additions & 2 deletions src/core/jsonpointer/stringify.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@

#include "grammar.h"

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer_pointer.h>
#include <sourcemeta/core/json_value.h>
#include <sourcemeta/core/uri.h>

#include <cassert> // assert
#include <ios> // std::basic_ostream
#include <ostream> // std::basic_ostream
#include <sstream> // std::basic_istringstream
#include <string> // std::to_string, std::basic_string
#include <variant> // std::holds_alternative

namespace sourcemeta::core::internal {
inline auto
Expand Down
1 change: 1 addition & 0 deletions test/jsonpointer/jsonpointer_error_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <gtest/gtest.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_error.h>

#include <exception> // std::exception
#include <string> // std::string
Expand Down
2 changes: 2 additions & 0 deletions test/jsonpointer/jsonpointer_parse_error_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#include <string>

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/json_error.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_error.h>

#define EXPECT_JSON_PARSE_ERROR(input) \
try { \
Expand Down
1 change: 1 addition & 0 deletions test/jsonpointer/jsonpointer_position_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer.h>
#include <sourcemeta/core/jsonpointer_position.h>

TEST(JSONPointer_position, track_1) {
const auto input{R"JSON([
Expand Down
1 change: 1 addition & 0 deletions test/jsonpointer/jsonpointer_token_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <gtest/gtest.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer.h>
#include <type_traits>

Expand Down
1 change: 1 addition & 0 deletions test/jsonpointer/jsonpointer_weakpointer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <gtest/gtest.h>
#include <sourcemeta/core/json.h>
#include <sourcemeta/core/jsonpointer.h>
#include <type_traits>

Expand Down