Skip to content

inlined findAstNode() calls #4146

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
orbitcowboy merged 1 commit into from
May 31, 2022
Merged

inlined findAstNode() calls #4146

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
13 changes: 0 additions & 13 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,6 @@
#include <unordered_map>
#include <utility>

const Token* findAstNode(const Token* ast, const std::function<bool(const Token*)>& pred)
{
const Token* result = nullptr;
visitAstNodes(ast, [&](const Token* tok) {
if (pred(tok)) {
result = tok;
return ChildrenToVisit::done;
}
return ChildrenToVisit::op1_and_op2;
});
return result;
}

const Token* findExpression(const nonneg int exprid,
const Token* start,
const Token* end,
Expand Down
15 changes: 14 additions & 1 deletion lib/astutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,20 @@ void visitAstNodes(T *ast, const TFunc &visitor)
} while (true);
}

const Token* findAstNode(const Token* ast, const std::function<bool(const Token*)>& pred);
template<class TFunc>
const Token* findAstNode(const Token* ast, const TFunc& pred)
{
const Token* result = nullptr;
visitAstNodes(ast, [&](const Token* tok) {
if (pred(tok)) {
result = tok;
return ChildrenToVisit::done;
}
return ChildrenToVisit::op1_and_op2;
});
return result;
}

const Token* findExpression(const nonneg int exprid,
const Token* start,
const Token* end,
Expand Down