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

C++: Fix parsing enum specifier II

Browse Source 
This amends the obviously wrong
de975aca4f, which did not honored nameless
enum specifiers.

This fixes e.g. "Find Usages" for declarations following "enum {};".

Change-Id: Id98c074156f576b9a63e6c25dab38721ca34e496
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-10-23 08:24:06 +02:00
parent 623294cd38
commit aac1bebace
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1835,10 +1835,8 @@ bool Parser::parseEnumSpecifier(SpecifierListAST *&node)
return false; return false;
} }
if (LA() == T_IDENTIFIER) if (LA() == T_COLON_COLON && LA() == T_IDENTIFIER)
parseName(ast->name); parseName(ast->name);
else
return false;
if (_languageFeatures.cxx11Enabled && LA() == T_COLON) { if (_languageFeatures.cxx11Enabled && LA() == T_COLON) {
ast->colon_token = consumeToken(); ast->colon_token = consumeToken();

9
tests/auto/cplusplus/ast/tst_ast.cpp
View File

@@ -206,6 +206,7 @@ private slots:
void invalidCode(); void invalidCode();
void enumDeclaration(); void enumDeclaration();
void invalidEnumClassDeclaration(); void invalidEnumClassDeclaration();
void invalidEnumWithDestructorId();
}; };
void tst_AST::gcc_attributes_1() void tst_AST::gcc_attributes_1()
@@ -2002,6 +2003,14 @@ void tst_AST::invalidEnumClassDeclaration()
QVERIFY(diag.errorCount != 0); QVERIFY(diag.errorCount != 0);
} }
void tst_AST::invalidEnumWithDestructorId()
{
QSharedPointer<TranslationUnit> unit(parseStatement(
"enum ~A {};", false));
QVERIFY(diag.errorCount != 0);
}
void tst_AST::initTestCase() void tst_AST::initTestCase()
{ {
control.setDiagnosticClient(&diag); control.setDiagnosticClient(&diag);