feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

[C++] Add error recovery for namespace declarations.

Browse Source 
Change-Id: I884ff9901c95467524e5eba38e91f75992d30e14
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Flex Ferrum <flexferrum@gmail.com>
This commit is contained in:
Erik Verbruggen
2012-02-24 13:06:21 +01:00
parent 164db0feeb
commit a621c99a0f
3 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/3rdparty/cplusplus/Parser.cpp vendored
View File

@@ -766,8 +766,33 @@ bool Parser::parseNamespace(DeclarationAST *&node)
parseAttributeSpecifier(*attr_ptr);
attr_ptr = &(*attr_ptr)->next;
}
if (LA() == T_LBRACE)
if (LA() == T_LBRACE) {
parseLinkageBody(ast->linkage_body);
} else { // attempt to do error recovery
unsigned pos = cursor();
for (;LA() != T_EOF_SYMBOL; consumeToken()) {
switch (LA()) {
case T_IDENTIFIER:
case T_POUND:
case T_POUND_POUND:
case T___ATTRIBUTE__:
case T_LPAREN:
case T_RPAREN:
case T_DEFAULT:
case T_PUBLIC:
case T_PRIVATE:
case T_PROTECTED:
continue;
}
if (tok().isLiteral())
continue;
break;
}
if (LA() == T_LBRACE && parseLinkageBody(ast->linkage_body))
warning(pos, "expected '{' before '%s'", _translationUnit->tokenAt(pos).spell());
else
rewind(pos);
}
node = ast;
return true;
}