Skip to content

fix: ids are now reset correctly for the next match statement #111

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
BowenFu merged 1 commit into from
Oct 14, 2026
Merged

fix: ids are now reset correctly for the next match statement #111

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
24 changes: 13 additions & 11 deletions develop/matchit/patterns.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ namespace matchit
return matchPattern(std::forward<Value>(value), mPattern, /*depth*/ 0,
context);
}

constexpr const Pattern& pattern() const {return mPattern;}
constexpr auto execute() const { return mHandler(); }

private:
Expand Down Expand Up @@ -1658,7 +1660,7 @@ namespace matchit
static_assert(PatternTraits<Or<Wildcard, float>>::nbIdV == 0);

template <typename Value, typename... PatternPairs>
constexpr auto matchPatterns(Value &&value, PatternPairs const &...patterns)
constexpr auto matchPatterns(Value &&value, PatternPairs const &...pattern_pairs)
{
using RetType = typename PatternPairsRetType<PatternPairs...>::RetType;
using TypeTuple = decltype(std::tuple_cat(
Expand All @@ -1669,19 +1671,19 @@ namespace matchit
if constexpr (!std::is_same_v<RetType, void>)
{
constexpr auto const func =
[](auto const &pattern, auto &&value, RetType &result) constexpr->bool
[](auto const &pattern_pair, auto &&value, RetType &result) constexpr->bool
{
auto context = typename ContextTrait<TypeTuple>::ContextT{};
if (pattern.matchValue(std::forward<Value>(value), context))
if (pattern_pair.matchValue(std::forward<Value>(value), context))
{
result = pattern.execute();
processId(pattern, 0, IdProcess::kCANCEL);
result = pattern_pair.execute();
processId(pattern_pair.pattern(), 0, IdProcess::kCANCEL);
return true;
}
return false;
};
RetType result{};
bool const matched = (func(patterns, value, result) || ...);
bool const matched = (func(pattern_pairs, value, result) || ...);
if (!matched)
{
throw std::logic_error{"Error: no patterns got matched!"};
Expand All @@ -1692,18 +1694,18 @@ namespace matchit
else
// statement, no return value, mismatching all patterns is not an error.
{
auto const func = [](auto const &pattern, auto &&value) -> bool
auto const func = [](auto const &pattern_pair, auto &&value) -> bool
{
auto context = typename ContextTrait<TypeTuple>::ContextT{};
if (pattern.matchValue(std::forward<Value>(value), context))
if (pattern_pair.matchValue(std::forward<Value>(value), context))
{
pattern.execute();
processId(pattern, 0, IdProcess::kCANCEL);
pattern_pair.execute();
processId(pattern_pair.pattern(), 0, IdProcess::kCANCEL);
return true;
}
return false;
};
bool const matched = (func(patterns, value) || ...);
bool const matched = (func(pattern_pairs, value) || ...);
static_cast<void>(matched);
}
}
Expand Down
24 changes: 13 additions & 11 deletions include/matchit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@ namespace matchit
return matchPattern(std::forward<Value>(value), mPattern, /*depth*/ 0,
context);
}

constexpr const Pattern& pattern() const {return mPattern;}
constexpr auto execute() const { return mHandler(); }

private:
Expand Down Expand Up @@ -1978,7 +1980,7 @@ namespace matchit
static_assert(PatternTraits<Or<Wildcard, float>>::nbIdV == 0);

template <typename Value, typename... PatternPairs>
constexpr auto matchPatterns(Value &&value, PatternPairs const &...patterns)
constexpr auto matchPatterns(Value &&value, PatternPairs const &...pattern_pairs)
{
using RetType = typename PatternPairsRetType<PatternPairs...>::RetType;
using TypeTuple = decltype(std::tuple_cat(
Expand All @@ -1989,19 +1991,19 @@ namespace matchit
if constexpr (!std::is_same_v<RetType, void>)
{
constexpr auto const func =
[](auto const &pattern, auto &&value, RetType &result) constexpr->bool
[](auto const &pattern_pair, auto &&value, RetType &result) constexpr->bool
{
auto context = typename ContextTrait<TypeTuple>::ContextT{};
if (pattern.matchValue(std::forward<Value>(value), context))
if (pattern_pair.matchValue(std::forward<Value>(value), context))
{
result = pattern.execute();
processId(pattern, 0, IdProcess::kCANCEL);
result = pattern_pair.execute();
processId(pattern_pair.pattern(), 0, IdProcess::kCANCEL);
return true;
}
return false;
};
RetType result{};
bool const matched = (func(patterns, value, result) || ...);
bool const matched = (func(pattern_pairs, value, result) || ...);
if (!matched)
{
throw std::logic_error{"Error: no patterns got matched!"};
Expand All @@ -2012,18 +2014,18 @@ namespace matchit
else
// statement, no return value, mismatching all patterns is not an error.
{
auto const func = [](auto const &pattern, auto &&value) -> bool
auto const func = [](auto const &pattern_pair, auto &&value) -> bool
{
auto context = typename ContextTrait<TypeTuple>::ContextT{};
if (pattern.matchValue(std::forward<Value>(value), context))
if (pattern_pair.matchValue(std::forward<Value>(value), context))
{
pattern.execute();
processId(pattern, 0, IdProcess::kCANCEL);
pattern_pair.execute();
processId(pattern_pair.pattern(), 0, IdProcess::kCANCEL);
return true;
}
return false;
};
bool const matched = (func(patterns, value) || ...);
bool const matched = (func(pattern_pairs, value) || ...);
static_cast<void>(matched);
}
}
Expand Down
15 changes: 15 additions & 0 deletions test/matchit/id.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,18 @@ TEST(Id, move)
auto y = std::move(*x);
EXPECT_TRUE((*x).empty());
}

TEST(Id, resetIdForNextMatch)
{
Id<int> x;

match(2)(
pattern | x = [&](){return *x;}
);

EXPECT_NO_THROW(
match(3)(
pattern | x = [&](){return *x;}
)
);
}