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

Improve 'Tokenizer::elseif' code in order to not touch 'else if' inside a macro parenthesis.

This commit is contained in:
Edoardo Prezioso 2012-02-26 02:44:16 +01:00
parent bbfae8e3ae
commit 4d3013d43d
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tokenize.cpp
View File

@ -6611,16 +6611,17 @@ bool Tokenizer::simplifyKnownVariablesSimplify(Token **tok2, Token *tok3, unsign
void Tokenizer::elseif() void Tokenizer::elseif()
{ {
for (Token *tok = _tokens; tok; tok = tok->next()) { for (Token *tok = _tokens; tok; tok = tok->next()) {
if (tok->str() == "(" || tok->str() == "[" ||
(tok->str() == "{" && tok->previous() && tok->previous()->str() == "="))
tok = tok->link();
if (!Token::simpleMatch(tok, "else if")) if (!Token::simpleMatch(tok, "else if"))
continue; continue;
int indent = 0; for (Token *tok2 = tok; tok2; tok2 = tok2->next()) {
for (Token *tok2 = tok; indent >= 0 && tok2; tok2 = tok2->next()) { if (Token::Match(tok2, "(|{|["))
if (Token::Match(tok2, "(|{")) tok2 = tok2->link();
++indent;
else if (Token::Match(tok2, ")|}"))
--indent;
if (indent == 0 && Token::Match(tok2, "}|;")) { if (Token::Match(tok2, "}|;")) {
if (tok2->next() && tok2->next()->str() != "else") { if (tok2->next() && tok2->next()->str() != "else") {
tok->insertToken("{"); tok->insertToken("{");
tok2->insertToken("}"); tok2->insertToken("}");

1
test/testsimplifytokens.cpp
View File

@ -869,6 +869,7 @@ private:
Tokenizer tokenizer(&settings, this); Tokenizer tokenizer(&settings, this);
std::istringstream istr(code); std::istringstream istr(code);
tokenizer.createTokens(istr); tokenizer.createTokens(istr);
tokenizer.tokenize(istr, "test.cpp");
tokenizer.elseif(); tokenizer.elseif();
return tokenizer.tokens()->stringifyList(false); return tokenizer.tokens()->stringifyList(false);
} }