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

Another fix for #1601 (change simplifyInitVar to split declaration from initialization)

This commit is contained in:
Robert Reif 2010-04-15 18:42:11 +02:00 committed by Daniel Marjamäki
parent 2e276576a4
commit 176795ef95
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -4807,7 +4807,7 @@ void Tokenizer::simplifyInitVar()
{
if (Token::Match(tok, "[{};] class|struct|union| %type% *| %var% ( &| %any% ) ;"))
tok = initVar(tok->next());
else if (tok == _tokens && Token::Match(tok, "class|struct|union| %type% *| %var% ( &| %num% ) ;"))
else if (tok == _tokens && Token::Match(tok, "class|struct|union| %type% *| %var% ( &| %any% ) ;"))
tok = initVar(tok);
}
}
@ -4833,6 +4833,8 @@ Token * Tokenizer::initVar(Token * tok)
// check initializer..
if (tok->tokAt(2)->isStandardType() || tok->tokAt(2)->str() == "void")
return tok;
else if (!tok->tokAt(2)->isNumber() && tok->tokAt(2)->str() != "&" && tok->tokAt(2)->varId() == 0)
return tok;
// insert '; var ='
tok->insertToken(";");

62
test/testtokenize.cpp
View File

@ -3075,7 +3075,7 @@ private:
}
// Check simplifyInitVar
void checkSimplifyInitVar(const char code[])
void checkSimplifyInitVar(const char code[], bool simplify = false)
{
// Tokenize..
Settings settings(Settings::testSettings());
@ -3084,6 +3084,11 @@ private:
std::istringstream istr(code);
errout.str("");
tokenizer.tokenize(istr, "test.cpp");
if (simplify)
tokenizer.simplifyTokenList();
tokenizer.validate();
}
void simplifyInitVar()
@ -3118,8 +3123,13 @@ private:
{
const char code[] = "int i ; int p(i);";
ASSERT_EQUALS("int i ; int p ; p = i ;", tokenizeAndStringify(code));
checkSimplifyInitVar(code);
// this can't be simplified because i doesn't have a varid yet
ASSERT_EQUALS("int i ; int p ( i ) ;", tokenizeAndStringify(code, false));
checkSimplifyInitVar(code, false);
ASSERT_EQUALS("", errout.str());
// this can be simplified because i shold have a varid
ASSERT_EQUALS("int i ; int p ; p = i ;", tokenizeAndStringify(code, true));
checkSimplifyInitVar(code, true);
ASSERT_EQUALS("", errout.str());
}
@ -3207,6 +3217,13 @@ private:
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "class S { int function(); };";
ASSERT_EQUALS("class S { int function ( ) ; } ;", tokenizeAndStringify(code));
checkSimplifyInitVar(code);
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "class S { int function(void); };";
ASSERT_EQUALS("class S { int function ( void ) ; } ;", tokenizeAndStringify(code));
@ -3249,6 +3266,45 @@ private:
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "int function(A);";
// We can't tell if this a function prototype or a variable without knowing
// what A is. Since A is undefined, just leave it alone.
ASSERT_EQUALS("int function ( A ) ;", tokenizeAndStringify(code));
checkSimplifyInitVar(code);
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "int i; int function(A);";
ASSERT_EQUALS("int i ; int function ( A ) ;", tokenizeAndStringify(code));
checkSimplifyInitVar(code);
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "class A { } ; int foo(A);";
// don't know what A is yet so leave it alone
ASSERT_EQUALS("class A { } ; int foo ( A ) ;", tokenizeAndStringify(code, false));
checkSimplifyInitVar(code, false);
ASSERT_EQUALS("", errout.str());
// we know A is not a variable here so leave it alone
ASSERT_EQUALS("class A { } ; int foo ( A ) ;", tokenizeAndStringify(code, true));
checkSimplifyInitVar(code, true);
ASSERT_EQUALS("", errout.str());
}
{
const char code[] = "class A { } ; A a; int foo(a);";
// don't know what a is yet so leave it alone
ASSERT_EQUALS("class A { } ; A a ; int foo ( a ) ;", tokenizeAndStringify(code, false));
checkSimplifyInitVar(code, false);
ASSERT_EQUALS("", errout.str());
// we know a is a variable here so simplify it
ASSERT_EQUALS("class A { } ; A a ; int foo ; foo = a ;", tokenizeAndStringify(code, true));
checkSimplifyInitVar(code, true);
ASSERT_EQUALS("", errout.str());
}
}
};