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

Merge pull request #618 from simartin/simplifyEnum_code_simplification 

Simplify the code handling C++0x typed enumerations.
This commit is contained in:
amai2012 2015-07-07 08:20:30 +02:00
parent f7c6140e1a 7bfb1fb545
commit 23402b9b44
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/tokenize.cpp
View File

@ -7593,22 +7593,15 @@ void Tokenizer::simplifyEnum()
if (tok->next()->str() == ":") { if (tok->next()->str() == ":") {
tok = tok->next(); tok = tok->next();
if (!tok->next() || !tok->next()->isName()) { typeTokenStart = tok->next();
syntaxError(tok); typeTokenEnd = 0;
return; // can't recover
}
tok = tok->next(); while (tok->next() && Token::Match(tok->next(), "::|%type%")) {
typeTokenStart = tok; typeTokenEnd = tok->next();
typeTokenEnd = typeTokenStart;
while (typeTokenEnd->next() && (typeTokenEnd->next()->str() == "::" ||
Token::Match(typeTokenEnd->next(), "%type%"))) {
typeTokenEnd = typeTokenEnd->next();
tok = tok->next(); tok = tok->next();
} }
if (!tok->next()) { if (!tok->next() || !typeTokenEnd) {
syntaxError(tok); syntaxError(tok);
return; // can't recover return; // can't recover
} }