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

Tokenizer: Refactorings and improvements. Better handling of []

This commit is contained in:
PKEuS 2011-12-07 21:15:00 +01:00 committed by Daniel Marjamäki
parent 97eecb78a7
commit 1c1c31bea0
5 changed files with 35 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/token.cpp
View File

@ -787,7 +787,7 @@ void Token::move(Token *srcStart, Token *srcEnd, Token *newLocation)
tok->_progressValue = newLocation->_progressValue;
}
const Token* Token::nextArgument() const
Token* Token::nextArgument() const
{
for (const Token* tok = this; tok; tok = tok->next()) {
if (tok->str() == ",")

2
lib/token.h
View File

@ -412,7 +412,7 @@ public:
* Returns the first token of the next argument. Does only work on argument
* lists. Returns 0, if there is no next argument
*/
const Token* nextArgument() const;
Token* nextArgument() const;
private:
void next(Token *nextToken) {

74
lib/tokenize.cpp
View File

@ -2553,15 +2553,22 @@ void Tokenizer::arraySize()
if (Token::Match(tok, "%var% [ ] = {")) {
unsigned int sz = 1;
const Token *tok2 = tok->tokAt(5);
while (Token::Match(tok2, "%any% ,")) {
if (tok2->isName())
for (Token *tok2 = tok->tokAt(5); tok2; tok2 = tok2->next()) {
if (tok2->str() == "{" || tok2->str() == "(" || tok2->str() == "[")
tok2 = tok2->link();
else if (tok2->str() == "<") { // Bailout. TODO: When link() supports <>, this bailout becomes unnecessary
sz = 0;
break;
++sz;
tok2 = tok2->tokAt(2);
} else if (tok2->str() == ",") {
if (!Token::Match(tok2->next(), "[},]"))
++sz;
else
tok2->deleteThis();
}
}
if (!tok2->isName() && Token::Match(tok2, "%any% } ;"))
if (sz != 0)
tok->next()->insertToken(MathLib::toString<unsigned int>(sz));
}
@ -2599,7 +2606,7 @@ void Tokenizer::labels()
}
if (!indentroundbraces && tok->str() == "case") {
while (NULL != (tok = tok->next())) {
if (Token::Match(tok->previous(), "%any% :"))
if (tok->str() == ":")
break;
}
if (!(tok->next()) || tok->next()->str() != ";") {
@ -5038,7 +5045,7 @@ void Tokenizer::simplifyCompoundAssignment()
tok->deleteNext();
} else {
// Enclose the rhs in parantheses..
if (!Token::Match(tok->next(), "%any% [;)]")) {
if (!Token::Match(tok->tokAt(2), "[;)]")) {
// Only enclose rhs in parantheses if there is some operator
bool someOperator = false;
for (Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
@ -6431,7 +6438,7 @@ bool Tokenizer::simplifyLogicalOperators()
ret = true;
}
// "%var%|) and %var%|("
else if (Token::Match(tok->previous(), "%any% %var% %any%")) {
else if (Token::Match(tok, "%var% %any%")) {
if (!Token::Match(tok, "and|or|bitand|bitor|xor|not_eq"))
continue;
@ -9451,58 +9458,25 @@ void Tokenizer::simplifyMicrosoftMemoryFunctions()
// FillMemory(dst, len, val) -> memset(dst, val, len)
tok->str("memset");
// find first ','
Token *tok1 = tok->tokAt(2);
unsigned int level = 0;
while (tok1) {
if (tok1->str() == "(")
++level;
else if (tok1->str() == ")")
--level;
else if (level == 0 && tok1->str() == ",")
break;
tok1 = tok1->next();
}
// find second ','
if (tok1)
tok1 = tok1->nextArgument(); // Second argument
if (tok1) {
Token *tok2 = tok1->next();
level = 0;
while (tok2) {
if (tok2->str() == "(")
++level;
else if (tok2->str() == ")")
--level;
else if (level == 0 && tok2->str() == ",")
break;
Token *tok2 = tok1->nextArgument(); // Third argument
tok2 = tok2->next();
}
// move second argument to third position
if (tok2) {
Token::move(tok1, tok2->previous(), tok->next()->link()->previous());
}
if (tok2)
Token::move(tok1->previous(), tok2->tokAt(-2), tok->next()->link()->previous()); // Swap third with second argument
}
} else if (Token::simpleMatch(tok, "ZeroMemory (")) {
// ZeroMemory(dst, len) -> memset(dst, 0, len)
tok->str("memset");
Token *tok1 = tok->tokAt(2);
unsigned int level = 0;
while (tok1) {
if (tok1->str() == "(")
++level;
else if (tok1->str() == ")")
--level;
else if (level == 0 && tok1->str() == ",")
break;
tok1 = tok1->next();
}
if (tok1)
tok1 = tok1->nextArgument(); // Second argument
if (tok1) {
tok1 = tok1->previous();
tok1->insertToken("0");
tok1 = tok1->next();
tok1->insertToken(",");

4
test/testsimplifytokens.cpp
View File

@ -2639,12 +2639,12 @@ private:
{
const char code[] = "int vals[] = { 0x13, 1?0x01:0x00 };";
ASSERT_EQUALS("int * vals ; vals = { 19 , 1 } ;", tok(code));
ASSERT_EQUALS("int vals [ 2 ] = { 19 , 1 } ;", tok(code));
}
{
const char code[] = "int vals[] = { 0x13, 0?0x01:0x00 };";
ASSERT_EQUALS("int * vals ; vals = { 19 , 0 } ;", tok(code));
ASSERT_EQUALS("int vals [ 2 ] = { 19 , 0 } ;", tok(code));
}
{

9
test/testtokenize.cpp
View File

@ -4975,7 +4975,7 @@ private:
"PF pfs[] = { &f1, &f1 };";
const char expected[] = " void f1(){} "
"void* pf; pf=& f1; "
"void* pfs[]={& f1,& f1};";
"void* pfs[2]={& f1,& f1};";
ASSERT_EQUALS(expected, simplifyFunctionPointers(code));
}
@ -5116,7 +5116,12 @@ private:
void arraySize() {
ASSERT_EQUALS("; int a[3]={1,2,3};", arraySize_(";int a[]={1,2,3};"));
ASSERT_EQUALS("; int a[]={ ABC,2,3};", arraySize_(";int a[]={ABC,2,3};"));
ASSERT_EQUALS("; int a[3]={1,2,3};", arraySize_(";int a[]={1,2,3,};"));
ASSERT_EQUALS("; foo a[3]={{1,2},{3,4},{5,6}};", arraySize_(";foo a[]={{1,2},{3,4},{5,6}};"));
TODO_ASSERT_EQUALS("; int a[1]={ foo< bar1, bar2>(123,4)};", "; int a[]={ foo< bar1, bar2>(123,4)};", arraySize_(";int a[]={foo<bar1,bar2>(123,4)};"));
ASSERT_EQUALS("; int a[2]={ b> c?1:2,3};", arraySize_(";int a[]={ b>c?1:2,3};"));
TODO_ASSERT_EQUALS(" int main(){ int a[2]={ b< c?1:2,3}}", " int main(){ int a[]={ b< c?1:2,3}}", arraySize_("int main(){int a[]={b<c?1:2,3}}"));
ASSERT_EQUALS("; int a[3]={ ABC,2,3};", arraySize_(";int a[]={ABC,2,3};"));
}
std::string labels_(const std::string &code) {