Skip to content

Refactor some facilities #102

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
Sep 13, 2026
Merged

Refactor some facilities #102

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
3 changes: 1 addition & 2 deletions include/iris/x4/attribute/as.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ struct as_type_parser : unary_parser<Subject, as_type_parser<T, Subject>>
// `outer_parser<U>(as<T>(subject))` forwards temporary `T` local variable for the subject, then move the variable to `U&`
template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4NonUnusedAttribute OuterAttr>
requires
(!std::same_as<std::remove_const_t<OuterAttr>, T>) &&
X4Movable<T, OuterAttr>
(!std::same_as<std::remove_const_t<OuterAttr>, T>)
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, OuterAttr& outer_attr) const
noexcept(
Expand Down
4 changes: 2 additions & 2 deletions include/iris/x4/core/action.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ struct action : proxy_parser<Subject, action<Subject, ActionF>>
noexcept(this->parse_main(first, last, ctx, std::declval<typename base_type::attribute_type&>()))
)
{
typename base_type::attribute_type attr_temp; // default-initialize
typename base_type::attribute_type attr_temp{}; // value-initialize
return this->parse_main(first, last, ctx, attr_temp);
}

Expand Down Expand Up @@ -138,7 +138,7 @@ struct action : proxy_parser<Subject, action<Subject, ActionF>>
noexcept(this->parse_main(first, last, ctx, std::declval<typename base_type::attribute_type&>()))
)
{
typename base_type::attribute_type attr_temp; // default-initialize
typename base_type::attribute_type attr_temp{}; // value-initialize
return this->parse_main(first, last, ctx, attr_temp);
}

Expand Down
16 changes: 14 additions & 2 deletions include/iris/x4/directive/with.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ using parsers::directive::with;
template<class Subject, class... IDs>
struct without_directive : proxy_parser<Subject, without_directive<Subject, IDs...>>
{
static_assert(sizeof...(IDs) > 0);

template<std::forward_iterator It, std::sentinel_for<It> Se, class Context, X4Attribute Attr>
[[nodiscard]] constexpr bool
parse(It& first, Se const& last, Context const& ctx, Attr& attr) const
Expand All @@ -258,9 +260,19 @@ namespace detail {
template<class... IDs>
struct without_gen
{
// `without<>(p)` is no-op
template<class Subject>
requires (sizeof...(IDs) == 0)
[[nodiscard]] static constexpr auto&&
operator[](Subject&& subject IRIS_LIFETIMEBOUND) noexcept
{
return static_cast<Subject&&>(subject);
}

template<class Subject>
[[nodiscard]] constexpr without_directive<std::remove_cvref_t<Subject>, IDs...>
operator[](Subject&& subject) const // TODO: MSVC 2022 does not properly handle static operator[]
requires (sizeof...(IDs) > 0)
[[nodiscard]] static constexpr without_directive<std::remove_cvref_t<Subject>, IDs...>
operator[](Subject&& subject)
noexcept(std::is_nothrow_constructible_v<without_directive<std::remove_cvref_t<Subject>, IDs...>, Subject>)
{
return without_directive<std::remove_cvref_t<Subject>, IDs...>{
Expand Down
Loading