Skip to content

Fix unused_container propagation #49

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
saki7 merged 1 commit into from
Feb 24, 2026
Merged

Fix unused_container propagation #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions include/iris/x4/directive/raw.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct raw_directive : unary_parser<Subject, raw_directive<Subject>>

static constexpr bool handles_container = true;

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4Attribute Attr>
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4NonUnusedAttribute Attr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, Attr& attr) const
// never noexcept; construction of `std::ranges::subrange` is never noexcept
Expand All @@ -53,9 +53,9 @@ struct raw_directive : unary_parser<Subject, raw_directive<Subject>>
return true;
}

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context>
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4UnusedAttribute UnusedAttr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, unused_type) const
parse(It& first, Se const& last, Context const& ctx, UnusedAttr const&) const
noexcept(is_nothrow_parsable_v<Subject, It, Se, Context, unused_type>)
{
return this->subject.parse(first, last, ctx, unused);
Expand Down
9 changes: 3 additions & 6 deletions include/iris/x4/operator/alternative.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ struct alternative : binary_parser<Left, Right, alternative<Left, Right>>

using binary_parser<Left, Right, alternative>::binary_parser;

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context>
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4UnusedAttribute UnusedAttr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, unused_type) const
parse(It& first, Se const& last, Context const& ctx, UnusedAttr const&) const
noexcept(
is_nothrow_parsable_v<Left, It, Se, Context, unused_type> &&
is_nothrow_parsable_v<Right, It, Se, Context, unused_type>
Expand All @@ -58,7 +58,7 @@ struct alternative : binary_parser<Left, Right, alternative<Left, Right>>
//
// You also should add test to `attribute.cpp`.

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, class Attr>
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4NonUnusedAttribute Attr>
requires (!traits::X4Container<Attr>)
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, Attr& attr) const
Expand All @@ -69,9 +69,6 @@ struct alternative : binary_parser<Left, Right, alternative<Left, Right>>
noexcept(x4::move_to(std::declval<Attr>(), attr))
)
{
static_assert(!std::same_as<std::remove_const_t<Attr>, unused_type>);
static_assert(!std::same_as<std::remove_const_t<Attr>, unused_container_type>);

static_assert(
std::default_initializable<Attr>,
"Attribute needs to be default-initializable to support rollback on failed parse attempt."
Expand Down
7 changes: 3 additions & 4 deletions include/iris/x4/operator/sequence.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ struct sequence : binary_parser<Left, Right, sequence<Left, Right>>

using binary_parser<Left, Right, sequence>::binary_parser;

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context>
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4UnusedAttribute UnusedAttr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, unused_type) const
parse(It& first, Se const& last, Context const& ctx, UnusedAttr const&) const
noexcept(
std::is_nothrow_copy_assignable_v<It> &&
is_nothrow_parsable_v<Left, It, Se, Context, unused_type> &&
Expand All @@ -66,8 +66,7 @@ struct sequence : binary_parser<Left, Right, sequence<Left, Right>>
return false;
}

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, class Attr>
requires (!std::same_as<std::remove_const_t<Attr>, unused_type>)
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4NonUnusedAttribute Attr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, Attr& attr) const
noexcept(noexcept(detail::parse_sequence(*this, first, last, ctx, attr)))
Expand Down