Skip to content

Commit 32fefc6

Browse files
chrchr-githubchrchr-github
authored
CheckInternal::checkRedundantNextPrevious(): Fix FN, simplify (danmar#6478)
1 parent bd694db commit 32fefc6

35 files changed

Lines changed: 370 additions & 372 deletions

‎lib/astutils.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,8 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
453453
return tok->valueType()->reference == Reference::None && tok->valueType()->pointer == 0;
454454
}
455455
const Token* ftok = nullptr;
456-
if (Token::simpleMatch(tok->previous(), ">") && tok->previous()->link())
457-
ftok = tok->previous()->link()->previous();
456+
if (Token::simpleMatch(tok->previous(), ">") && tok->linkAt(-1))
457+
ftok = tok->linkAt(-1)->previous();
458458
else
459459
ftok = tok->previous();
460460
if (!ftok)
@@ -538,7 +538,7 @@ static T* nextAfterAstRightmostLeafGeneric(T* tok)
538538
else
539539
break;
540540
} while (rightmostLeaf->astOperand1() || rightmostLeaf->astOperand2());
541-
while (Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->next()->link(), rightmostLeaf->next(), tok))
541+
while (Token::Match(rightmostLeaf->next(), "]|)") && !hasToken(rightmostLeaf->linkAt(1), rightmostLeaf->next(), tok))
542542
rightmostLeaf = rightmostLeaf->next();
543543
if (Token::Match(rightmostLeaf, "{|(|[") && rightmostLeaf->link())
544544
rightmostLeaf = rightmostLeaf->link();
@@ -568,7 +568,7 @@ Token* astParentSkipParens(Token* tok)
568568
if (parent->link() != nextAfterAstRightmostLeaf(tok))
569569
return parent;
570570
if (Token::Match(parent->previous(), "%name% (") ||
571-
(Token::simpleMatch(parent->previous(), "> (") && parent->previous()->link()))
571+
(Token::simpleMatch(parent->previous(), "> (") && parent->linkAt(-1)))
572572
return parent;
573573
return astParentSkipParens(parent);
574574
}
@@ -839,7 +839,7 @@ static T* getCondTokFromEndImpl(T* endBlock)
839839
if (Token::simpleMatch(startBlock->previous(), "do"))
840840
return getCondTok(startBlock->previous());
841841
if (Token::simpleMatch(startBlock->previous(), ")"))
842-
return getCondTok(startBlock->previous()->link());
842+
return getCondTok(startBlock->linkAt(-1));
843843
if (Token::simpleMatch(startBlock->tokAt(-2), "} else {"))
844844
return getCondTokFromEnd(startBlock->tokAt(-2));
845845
return nullptr;
@@ -1669,7 +1669,7 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
16691669
if (!compareTokenFlags(tok1, tok2, macro))
16701670
return false;
16711671

1672-
if (pure && tok1->isName() && tok1->next()->str() == "(" && tok1->str() != "sizeof" && !(tok1->variable() && tok1 == tok1->variable()->nameToken())) {
1672+
if (pure && tok1->isName() && tok1->strAt(1) == "(" && tok1->str() != "sizeof" && !(tok1->variable() && tok1 == tok1->variable()->nameToken())) {
16731673
if (!tok1->function()) {
16741674
if (Token::simpleMatch(tok1->previous(), ".")) {
16751675
const Token *lhs = tok1->previous();
@@ -1694,11 +1694,11 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
16941694
}
16951695
}
16961696
// templates/casts
1697-
if ((tok1->next() && tok1->next()->link() && Token::Match(tok1, "%name% <")) ||
1698-
(tok2->next() && tok2->next()->link() && Token::Match(tok2, "%name% <"))) {
1697+
if ((tok1->next() && tok1->linkAt(1) && Token::Match(tok1, "%name% <")) ||
1698+
(tok2->next() && tok2->linkAt(1) && Token::Match(tok2, "%name% <"))) {
16991699

17001700
// non-const template function that is not a dynamic_cast => return false
1701-
if (pure && Token::simpleMatch(tok1->next()->link(), "> (") &&
1701+
if (pure && Token::simpleMatch(tok1->linkAt(1), "> (") &&
17021702
!(tok1->function() && tok1->function()->isConst()) &&
17031703
tok1->str() != "dynamic_cast")
17041704
return false;
@@ -1725,7 +1725,7 @@ bool isSameExpression(bool macro, const Token *tok1, const Token *tok2, const Se
17251725
// cast => assert that the casts are equal
17261726
if (tok1->str() == "(" && tok1->previous() &&
17271727
!tok1->previous()->isName() &&
1728-
!(tok1->previous()->str() == ">" && tok1->previous()->link())) {
1728+
!(tok1->strAt(-1) == ">" && tok1->linkAt(-1))) {
17291729
const Token *t1 = tok1->next();
17301730
const Token *t2 = tok2->next();
17311731
while (t1 && t2 &&
@@ -2052,7 +2052,7 @@ bool isConstExpression(const Token *tok, const Library& library)
20522052
return true;
20532053
if (tok->variable() && tok->variable()->isVolatile())
20542054
return false;
2055-
if (tok->isName() && tok->next()->str() == "(") {
2055+
if (tok->isName() && tok->strAt(1) == "(") {
20562056
if (!isConstFunctionCall(tok, library))
20572057
return false;
20582058
}
@@ -2233,8 +2233,8 @@ bool isReturnScope(const Token* const endToken, const Library& library, const To
22332233
*unknownFunc = prev->previous();
22342234
return false;
22352235
}
2236-
if (Token::simpleMatch(prev->previous(), ") ;") && prev->previous()->link() &&
2237-
isEscaped(prev->previous()->link()->astTop(), functionScope, library))
2236+
if (Token::simpleMatch(prev->previous(), ") ;") && prev->linkAt(-1) &&
2237+
isEscaped(prev->linkAt(-1)->astTop(), functionScope, library))
22382238
return true;
22392239
if (isEscaped(prev->previous()->astTop(), functionScope, library))
22402240
return true;
@@ -2740,7 +2740,7 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings &settings,
27402740

27412741
// structured binding, nonconst reference variable in lhs
27422742
if (Token::Match(tok2->astParent(), ":|=") && tok2 == tok2->astParent()->astOperand2() && Token::simpleMatch(tok2->astParent()->previous(), "]")) {
2743-
const Token *typeStart = tok2->astParent()->previous()->link()->previous();
2743+
const Token *typeStart = tok2->astParent()->linkAt(-1)->previous();
27442744
if (Token::simpleMatch(typeStart, "&"))
27452745
typeStart = typeStart->previous();
27462746
if (typeStart && Token::Match(typeStart->previous(), "[;{}(] auto &| [")) {
@@ -3095,7 +3095,7 @@ int numberOfArgumentsWithoutAst(const Token* start)
30953095
const Token* openBracket = start->next();
30963096
while (Token::simpleMatch(openBracket, ")"))
30973097
openBracket = openBracket->next();
3098-
if (openBracket && openBracket->str()=="(" && openBracket->next() && openBracket->next()->str()!=")") {
3098+
if (openBracket && openBracket->str()=="(" && openBracket->next() && openBracket->strAt(1)!=")") {
30993099
const Token* argument=openBracket->next();
31003100
while (argument) {
31013101
++arguments;
@@ -3595,7 +3595,7 @@ bool isGlobalData(const Token *expr)
35953595
return ChildrenToVisit::none;
35963596
}
35973597
}
3598-
if (tok->varId() == 0 && tok->isName() && tok->previous()->str() != ".") {
3598+
if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") {
35993599
globalData = true;
36003600
return ChildrenToVisit::none;
36013601
}
@@ -3609,7 +3609,7 @@ bool isGlobalData(const Token *expr)
36093609
globalData = true;
36103610
return ChildrenToVisit::none;
36113611
}
3612-
if (tok->previous()->str() != "." && !tok->variable()->isLocal() && !tok->variable()->isArgument()) {
3612+
if (tok->strAt(-1) != "." && !tok->variable()->isLocal() && !tok->variable()->isArgument()) {
36133613
globalData = true;
36143614
return ChildrenToVisit::none;
36153615
}

‎lib/checkclass.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
983983
tok2 = tok2->next();
984984
if (tok2->str() == "&")
985985
tok2 = tok2->next();
986-
if (isVariableChangedByFunctionCall(tok2, tok2->previous()->str() == "&", tok2->varId(), *mSettings, nullptr))
986+
if (isVariableChangedByFunctionCall(tok2, tok2->strAt(-1) == "&", tok2->varId(), *mSettings, nullptr))
987987
assignVar(usage, tok2->varId());
988988
}
989989
}
@@ -1047,7 +1047,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
10471047
const Token *tok2 = ftok;
10481048
while (tok2) {
10491049
if (tok2->strAt(1) == "[")
1050-
tok2 = tok2->next()->link();
1050+
tok2 = tok2->linkAt(1);
10511051
else if (Token::Match(tok2->next(), ". %name%"))
10521052
tok2 = tok2->tokAt(2);
10531053
else
@@ -1622,22 +1622,22 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
16221622

16231623
// check if a function is called
16241624
if (tok->strAt(2) == "(" &&
1625-
tok->linkAt(2)->next()->str() == ";") {
1625+
tok->linkAt(2)->strAt(1) == ";") {
16261626
// check if it is a member function
16271627
for (std::list<Function>::const_iterator it = scope->functionList.cbegin(); it != scope->functionList.cend(); ++it) {
16281628
// check for a regular function with the same name and a body
16291629
if (it->type == Function::eFunction && it->hasBody() &&
1630-
it->token->str() == tok->next()->str()) {
1630+
it->token->str() == tok->strAt(1)) {
16311631
// check for the proper return type
1632-
if (it->tokenDef->previous()->str() == "&" &&
1632+
if (it->tokenDef->strAt(-1) == "&" &&
16331633
it->tokenDef->strAt(-2) == scope->className) {
16341634
// make sure it's not a const function
16351635
if (!it->isConst()) {
16361636
/** @todo make sure argument types match */
16371637
// avoid endless recursions
16381638
if (analyzedFunctions.find(&*it) == analyzedFunctions.end()) {
16391639
analyzedFunctions.insert(&*it);
1640-
checkReturnPtrThis(scope, &*it, it->arg->link()->next(), it->arg->link()->next()->link(),
1640+
checkReturnPtrThis(scope, &*it, it->arg->link()->next(), it->arg->link()->linkAt(1),
16411641
analyzedFunctions);
16421642
}
16431643
// just bail for now
@@ -1653,7 +1653,7 @@ void CheckClass::checkReturnPtrThis(const Scope *scope, const Function *func, co
16531653
else if (!(Token::simpleMatch(tok->next(), "operator= (") ||
16541654
Token::simpleMatch(tok->next(), "this . operator= (") ||
16551655
(Token::Match(tok->next(), "%type% :: operator= (") &&
1656-
tok->next()->str() == scope->className)))
1656+
tok->strAt(1) == scope->className)))
16571657
operatorEqRetRefThisError(func->token);
16581658
}
16591659
if (foundReturn) {
@@ -1853,7 +1853,7 @@ const Token * CheckClass::getIfStmtBodyStart(const Token *tok, const Token *rhs)
18531853
case Bool::TRUE:
18541854
return top->link()->next();
18551855
case Bool::FALSE:
1856-
return top->link()->next()->link();
1856+
return top->link()->linkAt(1);
18571857
}
18581858
}
18591859
return nullptr;
@@ -2407,7 +2407,7 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, Member
24072407
const Token *lpar = funcTok->next();
24082408
if (Token::simpleMatch(lpar, "( ) ("))
24092409
lpar = lpar->tokAt(2);
2410-
for (const Token* tok = lpar->next(); tok && tok != funcTok->next()->link(); tok = tok->next()) {
2410+
for (const Token* tok = lpar->next(); tok && tok != funcTok->linkAt(1); tok = tok->next()) {
24112411
if (tok->str() == "(")
24122412
tok = tok->link();
24132413
else if ((tok->isName() && isMemberVar(scope, tok)) || (tok->isUnaryOp("&") && (tok = tok->astOperand1()) && isMemberVar(scope, tok))) {
@@ -2848,11 +2848,11 @@ const std::list<const Token *> & CheckClass::getVirtualFunctionCalls(const Funct
28482848
continue;
28492849

28502850
if (tok->previous() &&
2851-
tok->previous()->str() == "(") {
2851+
tok->strAt(-1) == "(") {
28522852
const Token * prev = tok->previous();
28532853
if (prev->previous() &&
28542854
(mSettings->library.ignorefunction(tok->str())
2855-
|| mSettings->library.ignorefunction(prev->previous()->str())))
2855+
|| mSettings->library.ignorefunction(prev->strAt(-1))))
28562856
continue;
28572857
}
28582858

‎lib/checkcondition.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void CheckCondition::assignIf()
106106

107107
if (Token::Match(tok->next(), "%num% [&|]")) {
108108
bitop = tok->strAt(2).at(0);
109-
num = MathLib::toBigNumber(tok->next()->str());
109+
num = MathLib::toBigNumber(tok->strAt(1));
110110
} else {
111111
const Token *endToken = Token::findsimplematch(tok, ";");
112112

@@ -116,7 +116,7 @@ void CheckCondition::assignIf()
116116

117117
if (endToken && Token::Match(endToken->tokAt(-2), "[&|] %num% ;")) {
118118
bitop = endToken->strAt(-2).at(0);
119-
num = MathLib::toBigNumber(endToken->previous()->str());
119+
num = MathLib::toBigNumber(endToken->strAt(-1));
120120
}
121121
}
122122

@@ -191,7 +191,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
191191
ret = true;
192192
if (ret && tok2->str() == ";")
193193
return false;
194-
if (!islocal && Token::Match(tok2, "%name% (") && !Token::simpleMatch(tok2->next()->link(), ") {"))
194+
if (!islocal && Token::Match(tok2, "%name% (") && !Token::simpleMatch(tok2->linkAt(1), ") {"))
195195
return true;
196196
if (Token::Match(tok2, "if|while (")) {
197197
if (!islocal && tok2->str() == "while")
@@ -205,7 +205,7 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
205205
}
206206

207207
// parse condition
208-
const Token * const end = tok2->next()->link();
208+
const Token * const end = tok2->linkAt(1);
209209
for (; tok2 != end; tok2 = tok2->next()) {
210210
if (Token::Match(tok2, "[(,] &| %varid% [,)]", varid)) {
211211
return true;
@@ -227,8 +227,8 @@ bool CheckCondition::assignIfParseScope(const Token * const assignTok,
227227

228228
const bool ret1 = assignIfParseScope(assignTok, end->tokAt(2), varid, islocal, bitop, num);
229229
bool ret2 = false;
230-
if (Token::simpleMatch(end->next()->link(), "} else {"))
231-
ret2 = assignIfParseScope(assignTok, end->next()->link()->tokAt(3), varid, islocal, bitop, num);
230+
if (Token::simpleMatch(end->linkAt(1), "} else {"))
231+
ret2 = assignIfParseScope(assignTok, end->linkAt(1)->tokAt(3), varid, islocal, bitop, num);
232232
if (ret1 || ret2)
233233
return true;
234234
}

‎lib/checkexceptionsafety.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void CheckExceptionSafety::checkRethrowCopy()
184184
if (varid) {
185185
for (const Token* tok = scope.bodyStart->next(); tok && tok != scope.bodyEnd; tok = tok->next()) {
186186
if (Token::simpleMatch(tok, "catch (") && tok->linkAt(1) && tok->linkAt(1)->next()) { // Don't check inner catch - it is handled in another iteration of outer loop.
187-
tok = tok->linkAt(1)->next()->link();
187+
tok = tok->linkAt(1)->linkAt(1);
188188
if (!tok)
189189
break;
190190
} else if (Token::Match(tok, "%varid% .", varid)) {

‎lib/checkfunctions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ static bool isForwardJump(const Token *gotoToken)
335335
if (!Token::Match(gotoToken, "goto %name% ;"))
336336
return false;
337337
for (const Token *prev = gotoToken; gotoToken; gotoToken = gotoToken->previous()) {
338-
if (Token::Match(prev, "%name% :") && prev->str() == gotoToken->next()->str())
338+
if (Token::Match(prev, "%name% :") && prev->str() == gotoToken->strAt(1))
339339
return true;
340340
if (prev->str() == "{" && prev->scope()->type == Scope::eFunction)
341341
return false;

‎lib/checkinternal.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,22 +296,14 @@ void CheckInternal::checkRedundantNextPrevious()
296296
continue;
297297
tok = tok->next();
298298

299-
if (Token::Match(tok, "previous ( ) . next|tokAt|strAt|linkAt (") || Token::Match(tok, "next ( ) . previous|tokAt|strAt|linkAt (") ||
299+
if (Token::Match(tok, "previous ( ) . previous|next|tokAt|str|strAt|link|linkAt (") || Token::Match(tok, "next ( ) . previous|next|tokAt|str|strAt|link|linkAt (") ||
300300
(Token::simpleMatch(tok, "tokAt (") && Token::Match(tok->linkAt(1), ") . previous|next|tokAt|strAt|linkAt|str|link ("))) {
301301
const std::string& func1 = tok->str();
302302
const std::string& func2 = tok->linkAt(1)->strAt(2);
303303

304304
if ((func2 == "previous" || func2 == "next" || func2 == "str" || func2 == "link") && tok->linkAt(1)->strAt(4) != ")")
305305
continue;
306306

307-
redundantNextPreviousError(tok, func1, func2);
308-
} else if (Token::Match(tok, "next|previous ( ) . next|previous ( ) . next|previous|linkAt|strAt|link|str (")) {
309-
const std::string& func1 = tok->str();
310-
const std::string& func2 = tok->strAt(8);
311-
312-
if ((func2 == "previous" || func2 == "next" || func2 == "str" || func2 == "link") && tok->strAt(10) != ")")
313-
continue;
314-
315307
redundantNextPreviousError(tok, func1, func2);
316308
}
317309
}

‎lib/checkio.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,7 +1434,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
14341434
const Token *tok1 = arg->next();
14351435
for (; tok1; tok1 = tok1->next()) {
14361436
if (tok1->str() == "," || tok1->str() == ")") {
1437-
if (tok1->previous()->str() == "]") {
1437+
if (tok1->strAt(-1) == "]") {
14381438
varTok = tok1->linkAt(-1)->previous();
14391439
if (varTok->str() == ")" && varTok->link()->previous()->tokType() == Token::eFunction) {
14401440
const Function * function = varTok->link()->previous()->function();
@@ -1455,7 +1455,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
14551455
}
14561456
return;
14571457
}
1458-
} else if (tok1->previous()->str() == ")" && tok1->linkAt(-1)->previous()->tokType() == Token::eFunction) {
1458+
} else if (tok1->strAt(-1) == ")" && tok1->linkAt(-1)->previous()->tokType() == Token::eFunction) {
14591459
const Function * function = tok1->linkAt(-1)->previous()->function();
14601460
if (function && function->retType && function->retType->isEnumType()) {
14611461
if (function->retType->classScope->enumType)
@@ -1484,9 +1484,9 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
14841484

14851485
// check for some common well known functions
14861486
else if (isCPP && ((Token::Match(tok1->previous(), "%var% . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->previous())) ||
1487-
(Token::Match(tok1->previous(), "] . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->previous()->link()->previous())))) {
1487+
(Token::Match(tok1->previous(), "] . size|empty|c_str ( ) [,)]") && isStdContainer(tok1->linkAt(-1)->previous())))) {
14881488
tempToken = new Token(tok1);
1489-
if (tok1->next()->str() == "size") {
1489+
if (tok1->strAt(1) == "size") {
14901490
// size_t is platform dependent
14911491
if (settings.platform.sizeof_size_t == 8) {
14921492
tempToken->str("long");
@@ -1502,9 +1502,9 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
15021502

15031503
tempToken->originalName("size_t");
15041504
tempToken->isUnsigned(true);
1505-
} else if (tok1->next()->str() == "empty") {
1505+
} else if (tok1->strAt(1) == "empty") {
15061506
tempToken->str("bool");
1507-
} else if (tok1->next()->str() == "c_str") {
1507+
} else if (tok1->strAt(1) == "c_str") {
15081508
tempToken->str("const");
15091509
tempToken->insertToken("*");
15101510
if (typeToken->strAt(2) == "string")
@@ -1534,7 +1534,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &settings,
15341534

15351535
if (varTok) {
15361536
variableInfo = varTok->variable();
1537-
element = tok1->previous()->str() == "]";
1537+
element = tok1->strAt(-1) == "]";
15381538

15391539
// look for std::vector operator [] and use template type as return type
15401540
if (variableInfo) {

0 commit comments

Comments
 (0)