diff options
author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-15 12:23:48 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-15 12:24:31 +0100 |
commit | 8de6ccc7755d855f23b2f05f5094490832a8ab32 (patch) | |
tree | d5f49c3172f8c77d297fce0102cc729bf7e4d5b7 /src/shared/cplusplus/ASTMatcher.cpp | |
parent | a0071f1ce968a3c01d034227f0c01042447dfb43 (diff) | |
download | qt-creator-8de6ccc7755d855f23b2f05f5094490832a8ab32.tar.gz |
Revert "Split Objective-C keyword parsing to handle the '@' separately."
This reverts commit 2a59d2ae0c889fe6e4ac50a3f110b0103f880c15.
Diffstat (limited to 'src/shared/cplusplus/ASTMatcher.cpp')
-rw-r--r-- | src/shared/cplusplus/ASTMatcher.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp index 627fe3abf8..c3e04a0d4e 100644 --- a/src/shared/cplusplus/ASTMatcher.cpp +++ b/src/shared/cplusplus/ASTMatcher.cpp @@ -1771,8 +1771,6 @@ bool ASTMatcher::match(StringLiteralAST *node, StringLiteralAST *pattern) (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->literal_token = node->literal_token; if (! pattern->next) @@ -2065,8 +2063,6 @@ bool ASTMatcher::match(ObjCClassForwardDeclarationAST *node, ObjCClassForwardDec else if (! AST::match(node->attribute_list, pattern->attribute_list, this)) return false; - pattern->at_token = node->at_token; - pattern->class_token = node->class_token; if (! pattern->identifier_list) @@ -2089,8 +2085,6 @@ bool ASTMatcher::match(ObjCClassDeclarationAST *node, ObjCClassDeclarationAST *p else if (! AST::match(node->attribute_list, pattern->attribute_list, this)) return false; - pattern->at_token = node->at_token; - pattern->interface_token = node->interface_token; pattern->implementation_token = node->implementation_token; @@ -2131,8 +2125,6 @@ bool ASTMatcher::match(ObjCClassDeclarationAST *node, ObjCClassDeclarationAST *p else if (! AST::match(node->member_declaration_list, pattern->member_declaration_list, this)) return false; - pattern->ending_at_token = node->ending_at_token; - pattern->end_token = node->end_token; return true; @@ -2148,8 +2140,6 @@ bool ASTMatcher::match(ObjCProtocolForwardDeclarationAST *node, ObjCProtocolForw else if (! AST::match(node->attribute_list, pattern->attribute_list, this)) return false; - pattern->at_token = node->at_token; - pattern->protocol_token = node->protocol_token; if (! pattern->identifier_list) @@ -2172,8 +2162,6 @@ bool ASTMatcher::match(ObjCProtocolDeclarationAST *node, ObjCProtocolDeclaration else if (! AST::match(node->attribute_list, pattern->attribute_list, this)) return false; - pattern->at_token = node->at_token; - pattern->protocol_token = node->protocol_token; if (! pattern->name) @@ -2191,8 +2179,6 @@ bool ASTMatcher::match(ObjCProtocolDeclarationAST *node, ObjCProtocolDeclaration else if (! AST::match(node->member_declaration_list, pattern->member_declaration_list, this)) return false; - pattern->ending_at_token = node->ending_at_token; - pattern->end_token = node->end_token; return true; @@ -2260,8 +2246,6 @@ bool ASTMatcher::match(ObjCProtocolExpressionAST *node, ObjCProtocolExpressionAS (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->protocol_token = node->protocol_token; pattern->lparen_token = node->lparen_token; @@ -2297,8 +2281,6 @@ bool ASTMatcher::match(ObjCEncodeExpressionAST *node, ObjCEncodeExpressionAST *p (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->encode_token = node->encode_token; if (! pattern->type_name) @@ -2349,8 +2331,6 @@ bool ASTMatcher::match(ObjCSelectorExpressionAST *node, ObjCSelectorExpressionAS (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->selector_token = node->selector_token; pattern->lparen_token = node->lparen_token; @@ -2387,8 +2367,6 @@ bool ASTMatcher::match(ObjCVisibilityDeclarationAST *node, ObjCVisibilityDeclara (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->visibility_token = node->visibility_token; return true; @@ -2421,8 +2399,6 @@ bool ASTMatcher::match(ObjCPropertyDeclarationAST *node, ObjCPropertyDeclaration else if (! AST::match(node->attribute_list, pattern->attribute_list, this)) return false; - pattern->at_token = node->at_token; - pattern->property_token = node->property_token; pattern->lparen_token = node->lparen_token; @@ -2611,8 +2587,6 @@ bool ASTMatcher::match(ObjCSynchronizedStatementAST *node, ObjCSynchronizedState (void) node; (void) pattern; - pattern->at_token = node->at_token; - pattern->synchronized_token = node->synchronized_token; pattern->lparen_token = node->lparen_token; |