diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-08 15:32:37 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-08 15:41:18 +0100 |
commit | 1af05166d956526728db448cfe34a98ee0e74e8f (patch) | |
tree | 39aabcd58c060040fe413d4b02ac1250f40a2c72 /src/shared/cplusplus/Parser.cpp | |
parent | bd1b9e6ccb3fb9c1e02df6644e2e50e4e0c5e5ee (diff) | |
download | qt-creator-1af05166d956526728db448cfe34a98ee0e74e8f.tar.gz |
Removed Q_DECLARE_FLAGS parsing, leaving it to the CPP to expand it.
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r-- | src/shared/cplusplus/Parser.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index 86fb18dd2c..a9fd9f0d50 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -1920,29 +1920,6 @@ bool Parser::parseQtFlags(DeclarationAST *&node) return true; } -// q-declare-flags ::= 'Q_DECLARE_FLAGS' '(' q-flags-name ',' q-enum-name ')' -// q-flags-name ::= T_IDENTIFIER -// q-enum-name ::= T_IDENTIFIER -bool Parser::parseQtDeclareFlags(DeclarationAST *&node) -{ - /*Q_DECLARE_FLAGS(flag enum)*/ - DEBUG_THIS_RULE(); - if (LA() != T_Q_DECLARE_FLAGS) - return false; - - QtDeclareFlagsDeclarationAST *ast = new (_pool) QtDeclareFlagsDeclarationAST; - ast->declareflags_specifier_token = consumeToken(); - match(T_LPAREN, &ast->lparen_token); - 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; - return true; -} - bool Parser::parseMemberSpecification(DeclarationAST *&node) { DEBUG_THIS_RULE(); @@ -1972,9 +1949,6 @@ bool Parser::parseMemberSpecification(DeclarationAST *&node) case T_Q_FLAGS: return parseQtFlags(node); - case T_Q_DECLARE_FLAGS: - return parseQtDeclareFlags(node); - default: return parseSimpleDeclaration(node, /*acceptStructDeclarator=*/true); } // switch |