Skip to content

Fix defer and call visitor #12

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
BartolomeyKant merged 2 commits into from
Aug 26, 2026
Merged

Fix defer and call visitor #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
383702b
fix invoke visit
BartolomeyKant Aug 26, 2026
9ed3634
fix namespace in defer macro
BartolomeyKant Aug 26, 2026
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: 4 additions & 2 deletions src/aether-miscpp/domain_visitor/details/node_visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
#ifndef AETHER_MISCPP_DOMAIN_VISITOR_DETAILS_NODE_VISITOR_H_
#define AETHER_MISCPP_DOMAIN_VISITOR_DETAILS_NODE_VISITOR_H_

#include <functional>
#include <type_traits>
#include <utility>
Expand Down Expand Up @@ -61,9 +62,10 @@ bool CallVisitor(U&& obj, Visitor&& visitor) {
if constexpr (std::is_invocable_v<Visitor, U>) {
if constexpr (std::is_same_v<bool, std::invoke_result_t<Visitor, U>>) {
return std::invoke(std::forward<Visitor>(visitor), std::forward<U>(obj));
} else {
std::invoke(std::forward<Visitor>(visitor), std::forward<U>(obj));
return true;
}
std::invoke(std::forward<Visitor>(visitor), std::forward<U>(obj));
return true;
} else {
return true;
}
Expand Down
6 changes: 4 additions & 2 deletions src/aether-miscpp/misc/defer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
#ifndef AETHER_MISCPP_MISC_DEFER_H_
#define AETHER_MISCPP_MISC_DEFER_H_

#include <utility>
#include <optional>
#include <type_traits>
#include <utility>

namespace ae {
/**
Expand Down Expand Up @@ -65,9 +65,11 @@ constexpr auto operator<<(MakeScopeExit, TCallable&& cb) {
}
} // namespace ae

#define ae_defer_at MakeScopeExit{} <<
#define AEMSCPP_CONCAT_(a, b) a##b
#define AEMSCPP_CONCAT(a, b) AEMSCPP_CONCAT_(a, b)

#define ae_defer_at ::ae::MakeScopeExit{} <<

#define ae_defer auto AEMSCPP_CONCAT(SCOPE_GUARD_, __LINE__) = ae_defer_at

#endif // AETHER_MISCPP_MISC_DEFER_H_
Loading