Skip to content

Remove framing functionality to predict instance locations #2149

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
jviotti merged 5 commits into from
Dec 29, 2025
Merged

Remove framing functionality to predict instance locations #2149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f85719
[WIP] Remove framing functionality to predict instance locations
jviotti Dec 26, 2025
2d5c710
No walker templates
jviotti Dec 29, 2025
fc9873e
No template tests
jviotti Dec 29, 2025
afc2915
Mangling for Pointer
jviotti Dec 29, 2025
41a757c
No pointer templates
jviotti Dec 29, 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
2 changes: 1 addition & 1 deletion src/core/jsonpointer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sourcemeta_library(NAMESPACE sourcemeta PROJECT core NAME jsonpointer
PRIVATE_HEADERS pointer.h position.h error.h token.h
walker.h template.h
walker.h
SOURCES jsonpointer.cc stringify.h parser.h grammar.h position.cc mangle.cc)

if(SOURCEMETA_CORE_INSTALL)
Expand Down
87 changes: 2 additions & 85 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 @@ -12,7 +12,6 @@
#include <sourcemeta/core/jsonpointer_error.h>
#include <sourcemeta/core/jsonpointer_pointer.h>
#include <sourcemeta/core/jsonpointer_position.h>
#include <sourcemeta/core/jsonpointer_template.h>
#include <sourcemeta/core/jsonpointer_walker.h>
// NOLINTEND(misc-include-cleaner)

Expand Down Expand Up @@ -50,10 +49,6 @@ const Pointer empty_pointer;
/// A global constant instance of the empty JSON WeakPointer.
const WeakPointer empty_weak_pointer;

/// @ingroup jsonpointer
/// A JSON Pointer with unresolved wildcards
using PointerTemplate = GenericPointerTemplate<Pointer>;

/// @ingroup jsonpointer
/// Get a value from a JSON document using a JSON Pointer (`const` overload).
///
Expand Down Expand Up @@ -466,27 +461,6 @@ auto stringify(const WeakPointer &pointer,
std::basic_ostream<JSON::Char, JSON::CharTraits> &stream)
-> void;

/// @ingroup jsonpointer
///
/// Stringify the input JSON Pointer template into a given C++ standard output
/// stream. For example:
///
/// ```cpp
/// #include <sourcemeta/core/jsonpointer.h>
/// #include <iostream>
/// #include <sstream>
///
/// const sourcemeta::core::Pointer base{"foo", "bar"};
/// const sourcemeta::core::PointerTemplate pointer{base};
/// std::ostringstream stream;
/// sourcemeta::core::stringify(pointer, stream);
/// std::cout << stream.str() << std::endl;
/// ```
SOURCEMETA_CORE_JSONPOINTER_EXPORT
auto stringify(const PointerTemplate &pointer,
std::basic_ostream<JSON::Char, JSON::CharTraits> &stream)
-> void;

/// @ingroup jsonpointer
///
/// Stringify the input JSON Pointer into a C++ standard string. For example:
Expand Down Expand Up @@ -525,27 +499,6 @@ auto to_string(const WeakPointer &pointer)
-> std::basic_string<JSON::Char, JSON::CharTraits,
std::allocator<JSON::Char>>;

/// @ingroup jsonpointer
///
/// Stringify the input JSON Pointer template into a C++ standard string. For
/// example:
///
/// ```cpp
/// #include <sourcemeta/core/jsonpointer.h>
/// #include <string>
/// #include <iostream>
///
/// sourcemeta::core::PointerTemplate pointer;
/// pointer.emplace_back(sourcemeta::core::Pointer::Token{"foo"});
/// pointer.emplace_back(sourcemeta::core::PointerTemplate::Wildcard::Property);
/// const std::string result{sourcemeta::core::to_string(pointer)};
/// std::cout << result << '\n';
/// ```
SOURCEMETA_CORE_JSONPOINTER_EXPORT
auto to_string(const PointerTemplate &pointer)
-> std::basic_string<JSON::Char, JSON::CharTraits,
std::allocator<JSON::Char>>;

/// @ingroup jsonpointer
///
/// Mangle a JSON Pointer template and prefix into a collision-free identifier.
Expand Down Expand Up @@ -574,13 +527,12 @@ auto to_string(const PointerTemplate &pointer)
/// #include <sourcemeta/core/jsonpointer.h>
/// #include <cassert>
///
/// const sourcemeta::core::PointerTemplate pointer{"foo", "bar"};
/// const sourcemeta::core::Pointer pointer{"foo", "bar"};
/// const auto result{sourcemeta::core::mangle(pointer, "schema")};
/// assert(result == "Schema_Foo_Bar");
/// ```
SOURCEMETA_CORE_JSONPOINTER_EXPORT
auto mangle(const PointerTemplate &pointer, std::string_view prefix)
-> std::string;
auto mangle(const Pointer &pointer, std::string_view prefix) -> std::string;

/// @ingroup jsonpointer
///
Expand Down Expand Up @@ -717,41 +669,6 @@ struct hash<sourcemeta::core::GenericPointer<
: last.to_index());
}
};

template <typename PointerT>
struct hash<sourcemeta::core::GenericPointerTemplate<PointerT>> {
auto operator()(const sourcemeta::core::GenericPointerTemplate<PointerT>
&pointer) const noexcept -> std::size_t {
const auto size{pointer.size()};
if (size == 0) {
return size;
}

auto hash_element =
[](const typename sourcemeta::core::GenericPointerTemplate<
PointerT>::value_type &element) -> std::size_t {
using Template = sourcemeta::core::GenericPointerTemplate<PointerT>;
const auto *token{std::get_if<typename Template::Token>(&element)};
if (token) {
return token->is_property()
? static_cast<std::size_t>(token->property_hash().a)
: token->to_index();
} else {
return element.index();
}
};

const auto &first{*pointer.cbegin()};
const auto &middle{
*(pointer.cbegin() +
static_cast<typename sourcemeta::core::GenericPointerTemplate<
PointerT>::difference_type>(size / 2))};
const auto &last{*(pointer.cend() - 1)};

return size + hash_element(first) + hash_element(middle) +
hash_element(last);
}
};
} // namespace std

#endif
Loading