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

A few more Token::Match -> ::simpleMatch replacements

This commit is contained in:
Raphael Geissert 2011-02-02 10:25:13 -06:00
parent 3c76dd2e3f
commit c9a0d95e89
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/tokenize.cpp
View File

@ -4713,7 +4713,7 @@ void Tokenizer::simplifyIfAddBraces()
if (Token::simpleMatch(tempToken, "; else if")) if (Token::simpleMatch(tempToken, "; else if"))
; ;
else if (Token::Match(tempToken, "; else")) else if (Token::simpleMatch(tempToken, "; else"))
innerIf = false; innerIf = false;
else else
break; break;
@ -5760,35 +5760,35 @@ void Tokenizer::simplifyStdType()
if (Token::simpleMatch(tok, "__int8")) if (Token::simpleMatch(tok, "__int8"))
tok->str("char"); tok->str("char");
else if (Token::Match(tok, "__int16")) else if (Token::simpleMatch(tok, "__int16"))
tok->str("short"); tok->str("short");
else if (Token::Match(tok, "__int32")) else if (Token::simpleMatch(tok, "__int32"))
tok->str("int"); tok->str("int");
else if (Token::Match(tok, "__int64")) else if (Token::simpleMatch(tok, "__int64"))
{ {
tok->str("long"); tok->str("long");
tok->isLong(true); tok->isLong(true);
} }
else if (Token::Match(tok, "long")) else if (Token::simpleMatch(tok, "long"))
{ {
if (Token::Match(tok->next(), "long")) if (Token::simpleMatch(tok->next(), "long"))
{ {
tok->isLong(true); tok->isLong(true);
tok->deleteNext(); tok->deleteNext();
} }
if (Token::Match(tok->next(), "int")) if (Token::simpleMatch(tok->next(), "int"))
tok->deleteNext(); tok->deleteNext();
else if (Token::Match(tok->next(), "double")) else if (Token::simpleMatch(tok->next(), "double"))
{ {
tok->str("double"); tok->str("double");
tok->isLong(true); tok->isLong(true);
tok->deleteNext(); tok->deleteNext();
} }
} }
else if (Token::Match(tok, "short")) else if (Token::simpleMatch(tok, "short"))
{ {
if (Token::Match(tok->next(), "int")) if (Token::simpleMatch(tok->next(), "int"))
tok->deleteNext(); tok->deleteNext();
} }
} }
@ -8251,7 +8251,7 @@ void Tokenizer::simplifyComma()
if (tok->previous() && tok->previous()->previous()) if (tok->previous() && tok->previous()->previous())
{ {
if (Token::Match(tok->previous()->previous(), "delete") && if (Token::simpleMatch(tok->previous()->previous(), "delete") &&
tok->next()->varId() != 0) tok->next()->varId() != 0)
{ {
// Handle "delete a, b;" // Handle "delete a, b;"