walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactoring; Use std::function instead of template type

This commit is contained in:
Daniel Marjamäki 2020-02-15 09:14:14 +01:00
parent 697ca12d97
commit 365da62624
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/forwardanalyzer.cpp
View File

@ -21,8 +21,8 @@ struct ForwardTraversal {
return std::make_pair(checkThen, checkElse); return std::make_pair(checkThen, checkElse);
} }
template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*>)> template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*>)>
Progress traverseTok(T* tok, F f, bool traverseUnknown, T** out = nullptr) { Progress traverseTok(T* tok, std::function<Progress(T*)> f, bool traverseUnknown, T** out = nullptr) {
if (Token::Match(tok, "asm|goto|continue|setjmp|longjmp")) if (Token::Match(tok, "asm|goto|continue|setjmp|longjmp"))
return Progress::Break; return Progress::Break;
else if (Token::Match(tok, "return|throw") || isEscapeFunction(tok, &settings->library)) { else if (Token::Match(tok, "return|throw") || isEscapeFunction(tok, &settings->library)) {
@ -52,8 +52,8 @@ struct ForwardTraversal {
return Progress::Continue; return Progress::Continue;
} }
template<class T, class F, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*>)> template<class T, REQUIRES("T must be a Token class", std::is_convertible<T*, const Token*>)>
Progress traverseRecursive(T* tok, F f, bool traverseUnknown) { Progress traverseRecursive(T* tok, std::function<Progress(T*)> f, bool traverseUnknown) {
if (!tok) if (!tok)
return Progress::Continue; return Progress::Continue;
if (tok->astOperand1() && traverseRecursive(tok->astOperand1(), f, traverseUnknown) == Progress::Break) if (tok->astOperand1() && traverseRecursive(tok->astOperand1(), f, traverseUnknown) == Progress::Break)
@ -109,11 +109,17 @@ struct ForwardTraversal {
} }
Progress updateTok(Token* tok, Token** out = nullptr) { Progress updateTok(Token* tok, Token** out = nullptr) {
return traverseTok(tok, [&](Token* tok2) { return update(tok2); }, false, out); std::function<Progress(Token*)> f = [this](Token* tok2) {
return update(tok2);
};
return traverseTok(tok, f, false, out);
} }
Progress updateRecursive(Token* tok) { Progress updateRecursive(Token* tok) {
return traverseRecursive(tok, [&](Token* tok2) { return update(tok2); }, false); std::function<Progress(Token*)> f = [this](Token* tok2) {
return update(tok2);
};
return traverseRecursive(tok, f, false);
} }
template <class T, class Predicate> template <class T, class Predicate>
@ -128,7 +134,7 @@ struct ForwardTraversal {
ForwardAnalyzer::Action analyzeRecursive(const Token* start) { ForwardAnalyzer::Action analyzeRecursive(const Token* start) {
ForwardAnalyzer::Action result = ForwardAnalyzer::Action::None; ForwardAnalyzer::Action result = ForwardAnalyzer::Action::None;
auto f = [&](const Token* tok) { std::function<Progress(const Token *)> f = [&](const Token* tok) {
result = analyzer->analyze(tok); result = analyzer->analyze(tok);
if (result.isModified() || result.isInconclusive()) if (result.isModified() || result.isInconclusive())
return Progress::Break; return Progress::Break;