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

Reduced the number of ambiguous C++ initializers.

Browse Source
This commit is contained in:
Roberto Raggi
2010-08-26 17:07:46 +02:00
parent 5e9d19cd66
commit 8131ff2df7
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/shared/cplusplus/Parser.cpp
View File

@@ -1304,6 +1304,24 @@ bool Parser::parseCoreDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_sp
return false;
}
static bool maybeCppInitializer(DeclaratorAST *declarator)
{
if (declarator->ptr_operator_list)
return false;
CoreDeclaratorAST *core_declarator = declarator->core_declarator;
if (! core_declarator)
return false;
DeclaratorIdAST *declarator_id = core_declarator->asDeclaratorId();
if (! declarator_id)
return false;
else if (! declarator_id->name)
return false;
else if (! declarator_id->name->asSimpleName())
return false;
return true;
}
bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specifier_list, ClassSpecifierAST *declaringClass)
{
DEBUG_THIS_RULE();
@@ -1316,7 +1334,7 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, SpecifierListAST *decl_specif
unsigned startOfPostDeclarator = cursor();
if (LA() == T_LPAREN) {
if (! declaringClass) {
if (! declaringClass && LA(2) != T_RPAREN && maybeCppInitializer(node)) {
unsigned lparen_token = cursor();
ExpressionAST *initializer = 0;