Skip to content

Commit 5de127e

Browse files
Update tokenlist.cpp
1 parent 99ee7db commit 5de127e

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

lib/tokenlist.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,10 +589,16 @@ static bool iscpp11init_impl(const Token * const tok)
589589
if (nameToken->str() == ">" && nameToken->link())
590590
nameToken = nameToken->link()->previous();
591591
if (Token::Match(nameToken, "]|*")) {
592-
const Token* newTok = nameToken->link() ? nameToken->link()->previous() : nameToken->previous();
593-
while (Token::Match(newTok, "%type%|::|*") && !newTok->isKeyword())
594-
newTok = newTok->previous();
595-
if (Token::simpleMatch(newTok, "new"))
592+
const Token* tok2 = nameToken;
593+
if (tok2->link()) {
594+
while (tok2 && tok2->link())
595+
tok2 = tok2->link()->previous();
596+
}
597+
else
598+
tok2 = tok2->previous();
599+
while (Token::Match(tok2, "%type%|::|*") && !tok2->isKeyword())
600+
tok2 = tok2->previous();
601+
if (Token::Match(tok2, "new|%var%"))
596602
return true;
597603
}
598604

0 commit comments

Comments
 (0)