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

Allow syntax "typedef 'typename' unsigned 'typename' (functon_name)()" (#1334) 

* Allow syntax "typedef 'typename' unsigned 'typename' (functon_name)()" for some old libraries
https://trac.cppcheck.net/ticket/7792

* Unnecessary check of "tokOffset", match-function already checks if it is null

* add testcase ticket #7792: simplifyTypedef124
This commit is contained in:
tam do thanh 2018-08-16 19:30:28 +07:00 committed by Daniel Marjamäki
parent fc97a5b11c
commit f33c09f1a7
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -674,6 +674,12 @@ void Tokenizer::simplifyTypedef()
typeEnd = tokOffset; typeEnd = tokOffset;
tokOffset = tokOffset->next(); tokOffset = tokOffset->next();
while(Token::Match(tokOffset, "%type%") &&
(tokOffset->isStandardType() || Token::Match(tokOffset, "unsigned|signed")) ) {
typeEnd = tokOffset;
tokOffset = tokOffset->next();
}
bool atEnd = false; bool atEnd = false;
while (!atEnd) { while (!atEnd) {
if (tokOffset && tokOffset->str() == "::") { if (tokOffset && tokOffset->str() == "::") {

17
test/testsimplifytypedef.cpp
View File

@ -161,6 +161,7 @@ private:
TEST_CASE(simplifyTypedef121); // ticket #5766 TEST_CASE(simplifyTypedef121); // ticket #5766
TEST_CASE(simplifyTypedef122); // segmentation fault TEST_CASE(simplifyTypedef122); // segmentation fault
TEST_CASE(simplifyTypedef123); // ticket #7406 TEST_CASE(simplifyTypedef123); // ticket #7406
TEST_CASE(simplifyTypedef124); // ticket #7792
TEST_CASE(simplifyTypedefFunction1); TEST_CASE(simplifyTypedefFunction1);
TEST_CASE(simplifyTypedefFunction2); // ticket #1685 TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@ -2508,6 +2509,22 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef124() { // ticket #7792
const char code[] = "typedef long unsigned int size_t;\n"
"typedef size_t (my_func)(char *, size_t, size_t, void *);";
// Check for output..
checkSimplifyTypedef(code);
ASSERT_EQUALS_WITHOUT_LINENUMBERS("[test.cpp:1]: (debug) Failed to parse 'typedef long unsigned int size_t ;'. The checking continues anyway.\n", errout.str());
const char code1[] = "typedef long unsigned int uint32_t;\n"
"typedef uint32_t (my_func)(char *, uint32_t, uint32_t, void *);";
// Check for output..
checkSimplifyTypedef(code1);
ASSERT_EQUALS("", errout.str());
}
void simplifyTypedefFunction1() { void simplifyTypedefFunction1() {
{ {