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

Fixed parsing of properties whose name is a C++ keyword.

Browse Source 
Reviewed-by: Roberto Raggi
This commit is contained in:
Erik Verbruggen
2010-03-03 16:45:18 +01:00
parent d2bb23e62f
commit cefdb3da30
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1792,8 +1792,15 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node)
if (LA() == T_LPAREN) {
ast->lparen_token = consumeToken();
parseTypeId(ast->type_id);
SimpleNameAST *property_name = new (_pool) SimpleNameAST;
match(T_IDENTIFIER, &property_name->identifier_token);
// special case: keywords are allowed for property names!
if (tok().isKeyword()) {
property_name->identifier_token = consumeToken();
} else {
match(T_IDENTIFIER, &property_name->identifier_token);
}
ast->property_name = property_name;
QtPropertyDeclarationItemListAST **iter = &ast->property_declaration_items;
while (true) {