diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-06 14:32:25 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-07 10:49:03 +0100 |
commit | 21488e8898b1aaf5d33b3a33b488e2e280219f06 (patch) | |
tree | 03f2bb0c876eaddd1112995f3c3907a2d2bf4f90 /src/shared/cplusplus/Parser.cpp | |
parent | ac6aba5ec34e2b2f7f83105e9a986e629e00ad14 (diff) | |
download | qt-creator-21488e8898b1aaf5d33b3a33b488e2e280219f06.tar.gz |
Added semantic checks for Q_ENUMS.
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r-- | src/shared/cplusplus/Parser.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 33f7660129..9c504f0f54 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -1792,8 +1792,8 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node) if (LA() == T_LPAREN) { ast->lparen_token = consumeToken(); parseTypeId(ast->type_id); - ast->type_name = new (_pool) SimpleNameAST; - match(T_IDENTIFIER, &ast->type_name->identifier_token); + ast->property_name = new (_pool) SimpleNameAST; + match(T_IDENTIFIER, &ast->property_name->identifier_token); while (true) { if (LA() == T_RPAREN) { @@ -1963,6 +1963,7 @@ bool Parser::parseQtDeclareFlags(DeclarationAST *&node) ast->flags_name = new (_pool) SimpleNameAST; match(T_IDENTIFIER, &ast->flags_name->identifier_token); match(T_COMMA, &ast->comma_token); + ast->enum_name = new (_pool) SimpleNameAST; match(T_IDENTIFIER, &ast->enum_name->identifier_token); match(T_RPAREN, &ast->rparen_token); node = ast; @@ -1995,13 +1996,11 @@ bool Parser::parseMemberSpecification(DeclarationAST *&node) case T_Q_ENUMS: return parseQtEnumDeclaration(node); -#ifdef ICHECK_BUILD case T_Q_FLAGS: - return parseQFlags(node); + return parseQtFlags(node); case T_Q_DECLARE_FLAGS: - return parseQDeclareFlags(node); -#endif + return parseQtDeclareFlags(node); default: return parseSimpleDeclaration(node, /*acceptStructDeclarator=*/true); |