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

really fix #2620 reference of typedef of array not simplified properly

This commit is contained in:
Robert Reif 2011-03-03 20:32:10 -05:00
parent d7a6e729b8
commit f3b2acf585
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -1791,6 +1791,17 @@ void Tokenizer::simplifyTypedef()
if (!inCast && !inSizeof) if (!inCast && !inSizeof)
tok2 = tok2->next(); tok2 = tok2->next();
// reference to array?
if (tok2->str() == "&")
{
tok2 = tok2->previous();
tok2->insertToken("(");
tok2 = tok2->tokAt(3);
tok2->insertToken(")");
tok2 = tok2->next();
Token::createMutualLinks(tok2, tok2->tokAt(-3));
}
tok2 = copyTokens(tok2, arrayStart, arrayEnd); tok2 = copyTokens(tok2, arrayStart, arrayEnd);
tok2 = tok2->next(); tok2 = tok2->next();

13
test/testsimplifytokens.cpp
View File

@ -243,6 +243,7 @@ private:
TEST_CASE(simplifyTypedef80); // ticket #2587 TEST_CASE(simplifyTypedef80); // ticket #2587
TEST_CASE(simplifyTypedef81); // ticket #2603 TEST_CASE(simplifyTypedef81); // ticket #2603
TEST_CASE(simplifyTypedef82); // ticket #2403 TEST_CASE(simplifyTypedef82); // ticket #2403
TEST_CASE(simplifyTypedef83); // ticket #2620
TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685 TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@ -4961,6 +4962,18 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef83() // ticket #2620
{
const char code[] = "typedef char Str[10];\n"
"void f(Str &cl) { }\n";
// The expected result..
const std::string expected("; "
"void f ( char ( & cl ) [ 10 ] ) { }");
ASSERT_EQUALS(expected, sizeof_(code));
}
void simplifyTypedefFunction1() void simplifyTypedefFunction1()
{ {
{ {