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

Fixed #1821 (simplifyTypedef: better typedef support)

This commit is contained in:
Robert Reif 2010-07-05 23:03:54 +02:00 committed by Daniel Marjamäki
parent 18a75edd20
commit c949a29d1e
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tokenize.cpp
View File

@ -842,7 +842,7 @@ void Tokenizer::simplifyTypedef()
} }
// check for pointers and references // check for pointers and references
while (Token::Match(tok->tokAt(offset), "*|&")) while (Token::Match(tok->tokAt(offset), "*|&|const"))
pointers.push_back(tok->tokAt(offset++)->str()); pointers.push_back(tok->tokAt(offset++)->str());
if (Token::Match(tok->tokAt(offset), "%type%")) if (Token::Match(tok->tokAt(offset), "%type%"))

22
test/testsimplifytokens.cpp
View File

@ -205,6 +205,7 @@ private:
TEST_CASE(simplifyTypedef52); // ticket #1782 TEST_CASE(simplifyTypedef52); // ticket #1782
TEST_CASE(simplifyTypedef53); // ticket #1801 TEST_CASE(simplifyTypedef53); // ticket #1801
TEST_CASE(simplifyTypedef54); // ticket #1814 TEST_CASE(simplifyTypedef54); // ticket #1814
TEST_CASE(simplifyTypedef55);
TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685 TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@ -4222,6 +4223,27 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef55()
{
const char code[] = "typedef volatile unsigned long * const hwreg_t ;\n"
"typedef void *const t1[2];\n"
"typedef int*const *_Iterator;\n"
"hwreg_t v1;\n"
"t1 v2;\n"
"_Iterator v3;\n";
// The expected result..
const std::string expected("; ; ; "
"long * v1 ; "
"void * v2 [ 2 ] ; "
"int * * v3 ;");
ASSERT_EQUALS(expected, sizeof_(code));
// Check for output..
checkSimplifyTypedef(code);
ASSERT_EQUALS("", errout.str());
}
void simplifyTypedefFunction1() void simplifyTypedefFunction1()
{ {
{ {