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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2009-01-26 13:04:05 +01:00
parent f31607b33d 5fc4fbb197
commit a0a4cec8a8
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
shared/cplusplus/Parser.cpp
View File

@@ -2556,24 +2556,12 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
return parseQtMethod(node); return parseQtMethod(node);
default: { default: {
unsigned startOfName = cursor();
NameAST *name = 0; NameAST *name = 0;
if (parseName(name)) { if (parseNameId(name)) {
if (LA() == T_IDENTIFIER || tok().isLiteral() || (tok().isOperator() && LA() != T_LPAREN &&
LA() != T_LBRACKET)) {
rewind(startOfName);
parseName(name, false);
}
// literal
// identifier <unop> ?
// identifier <binop>
// identifier <access>
// identifier rparen
// lparen type rparen identifier [[cast-expression]]
node = name; node = name;
return true; return true;
} }
break;
} // default } // default
} // switch } // switch
@@ -2581,6 +2569,23 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
return false; return false;
} }
bool Parser::parseNameId(NameAST *&name)
{
unsigned start = cursor();
if (! parseName(name))
return false;
if (LA() == T_IDENTIFIER ||
tok().isLiteral() ||
(tok().isOperator() && LA() != T_LPAREN && LA() != T_LBRACKET))
{
rewind(start);
return parseName(name, false);
}
return false;
}
bool Parser::parseNestedExpression(ExpressionAST *&node) bool Parser::parseNestedExpression(ExpressionAST *&node)
{ {
if (LA() == T_LPAREN) { if (LA() == T_LPAREN) {
@@ -2763,7 +2768,7 @@ bool Parser::parsePostfixExpression(ExpressionAST *&node)
ast->access_token = consumeToken(); ast->access_token = consumeToken();
if (LA() == T_TEMPLATE) if (LA() == T_TEMPLATE)
ast->template_token = consumeToken(); ast->template_token = consumeToken();
if (! parseName(ast->member_name)) if (! parseNameId(ast->member_name))
_translationUnit->error(cursor(), "expected unqualified-id before token `%s'", _translationUnit->error(cursor(), "expected unqualified-id before token `%s'",
tok().spell()); tok().spell());
*postfix_ptr = ast; *postfix_ptr = ast;

1
shared/cplusplus/Parser.h
View File

@@ -141,6 +141,7 @@ public:
bool parseMultiplicativeExpression(ExpressionAST *&node); bool parseMultiplicativeExpression(ExpressionAST *&node);
bool parseTemplateId(NameAST *&node); bool parseTemplateId(NameAST *&node);
bool parseClassOrNamespaceName(NameAST *&node); bool parseClassOrNamespaceName(NameAST *&node);
bool parseNameId(NameAST *&node);
bool parseName(NameAST *&node, bool acceptTemplateId = true); bool parseName(NameAST *&node, bool acceptTemplateId = true);
bool parseNestedNameSpecifier(NestedNameSpecifierAST *&node, bool acceptTemplateId); bool parseNestedNameSpecifier(NestedNameSpecifierAST *&node, bool acceptTemplateId);
bool parseNestedNameSpecifierOpt(NestedNameSpecifierAST *&name, bool acceptTemplateId); bool parseNestedNameSpecifierOpt(NestedNameSpecifierAST *&name, bool acceptTemplateId);