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

Fixed #4002 (syntax error for 'X( typedef, Y)')

This commit is contained in:
Daniel Marjamäki 2012-09-09 09:14:46 +02:00
parent 69a0062177
commit 0c55d5cfa7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/tokenize.cpp
View File

@ -527,6 +527,12 @@ void Tokenizer::simplifyTypedef()
tok = tok->previous(); tok = tok->previous();
} }
// Skip typedefs inside parentheses (#2453 and #4002)
if (tok->str() == "(" && tok->strAt(1) == "typedef") {
tok = tok->next();
continue;
}
if (Token::Match(tok, "class|struct|namespace %any%") && if (Token::Match(tok, "class|struct|namespace %any%") &&
(!tok->previous() || (tok->previous() && tok->previous()->str() != "enum"))) { (!tok->previous() || (tok->previous() && tok->previous()->str() != "enum"))) {
isNamespace = (tok->str() == "namespace"); isNamespace = (tok->str() == "namespace");
@ -551,12 +557,6 @@ void Tokenizer::simplifyTypedef()
} else if (tok->str() != "typedef") } else if (tok->str() != "typedef")
continue; continue;
// check for syntax errors
if (tok->previous() && tok->previous()->str() == "(") {
syntaxError(tok);
continue;
}
// pull struct, union, enum or class definition out of typedef // pull struct, union, enum or class definition out of typedef
// use typedef name for unnamed struct, union, enum or class // use typedef name for unnamed struct, union, enum or class
if (Token::Match(tok->next(), "const| struct|enum|union|class %type% {") || if (Token::Match(tok->next(), "const| struct|enum|union|class %type% {") ||

2
test/testsimplifytokens.cpp
View File

@ -5382,7 +5382,7 @@ private:
const char code[] = "void f1(typedef int x) {}\n"; const char code[] = "void f1(typedef int x) {}\n";
const std::string expected = "void f1 ( typedef int x ) { }"; const std::string expected = "void f1 ( typedef int x ) { }";
ASSERT_EQUALS(expected, tok(code)); ASSERT_EQUALS(expected, tok(code));
ASSERT_EQUALS("[test.cpp:1]: (error) syntax error\n", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void simplifyTypedef77() { // ticket #2554 void simplifyTypedef77() { // ticket #2554