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

Fixed Q_PROPERTY parsing to handle all possible cases.

Browse Source
This commit is contained in:
Erik Verbruggen
2010-02-16 16:54:39 +01:00
parent 8c2928e12e
commit c79f25d5a6
12 changed files with 38 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1806,34 +1806,30 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
case Token_READ:
case Token_WRITE:
case Token_RESET:
case Token_NOTIFY: {
QtPropertyDeclarationNamingItemAST *nItem = new (_pool) QtPropertyDeclarationNamingItemAST;
nItem->item_name_token = consumeToken();
nItem->name_value = new (_pool) SimpleNameAST;
match(T_IDENTIFIER, &nItem->name_value->identifier_token);
item = nItem;
break;
}
case Token_NOTIFY:
case Token_DESIGNABLE:
case Token_SCRIPTABLE:
case Token_STORED:
case Token_USER: {
QtPropertyDeclarationBoolItemAST *bItem = new (_pool) QtPropertyDeclarationBoolItemAST;
bItem->item_name_token = consumeToken();
unsigned item_name_token = consumeToken();
ExpressionAST *expr = 0;
if (parseBoolLiteral(expr)) {
bItem->bool_value = expr->asBoolLiteral();
if (parsePostfixExpression(expr)) {
QtPropertyDeclarationItemAST *bItem =
new (_pool) QtPropertyDeclarationItemAST;
bItem->item_name_token = item_name_token;
bItem->expression = expr;
item = bItem;
} else {
_translationUnit->error(cursor(), "expected `true' or `false' before `%s'", tok().spell());
_translationUnit->error(cursor(),
"expected expression before `%s'",
tok().spell());
}
break;
}
case Token_CONSTANT:
case Token_FINAL: {
QtPropertyDeclarationFlaggingItemAST *fItem = new (_pool) QtPropertyDeclarationFlaggingItemAST;
QtPropertyDeclarationItemAST *fItem = new (_pool) QtPropertyDeclarationItemAST;
fItem->item_name_token = consumeToken();
item = fItem;
break;