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

Reported by clang-tidy check misc-include-cleaner
Refs: sourcemeta/blaze#429

Signed-off-by: Balakrishna Avulapati <[email protected]>

Author: bavulapati

src/core/jsonpointer/include/sourcemeta/core/jsonpointer.h

@@ -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>

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_pointer.h

@@ -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

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_position.h

@@ -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

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_subpointer_walker.h

@@ -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

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_template.h

@@ -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 {
 

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.h>
+#include <sourcemeta/core/json_value.h>
 
 #include <cassert> // assert
 

src/core/jsonpointer/include/sourcemeta/core/jsonpointer_walker.h

@@ -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 {
 

src/core/jsonpointer/jsonpointer.cc

@@ -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
 

src/core/jsonpointer/parser.h

@@ -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

src/core/jsonpointer/position.cc

@@ -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 {