From 496ff15db3fa6b2004899345eef58ce5253514a1 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Tue, 10 Nov 2009 12:39:29 +0100 Subject: Removed ObjCIdentifierListAST Done with Erik Verbruggen --- src/shared/cplusplus/CheckDeclaration.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/shared/cplusplus/CheckDeclaration.cpp') diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp index 7adcde83bc..6dc9c9a75b 100644 --- a/src/shared/cplusplus/CheckDeclaration.cpp +++ b/src/shared/cplusplus/CheckDeclaration.cpp @@ -501,14 +501,14 @@ bool CheckDeclaration::visit(ObjCProtocolForwardDeclarationAST *ast) const unsigned sourceLocation = ast->firstToken(); List **symbolIter = &ast->symbols; - for (IdentifierListAST *it = ast->identifier_list; it; it = it->next) { + for (ObjCIdentifierListAST *it = ast->identifier_list; it; it = it->next) { unsigned declarationLocation; - if (it->name) - declarationLocation = it->name->firstToken(); + if (it->value) + declarationLocation = it->value->firstToken(); else declarationLocation = sourceLocation; - Name *protocolName = semantic()->check(it->name, _scope); + Name *protocolName = semantic()->check(it->value, _scope); ObjCForwardProtocolDeclaration *fwdProtocol = control()->newObjCForwardProtocolDeclaration(sourceLocation, protocolName); fwdProtocol->setStartOffset(tokenAt(ast->firstToken()).offset); fwdProtocol->setEndOffset(tokenAt(ast->lastToken()).offset); @@ -537,8 +537,8 @@ bool CheckDeclaration::visit(ObjCProtocolDeclarationAST *ast) protocol->setEndOffset(tokenAt(ast->lastToken()).offset); if (ast->protocol_refs && ast->protocol_refs->identifier_list) { - for (IdentifierListAST *iter = ast->protocol_refs->identifier_list; iter; iter = iter->next) { - NameAST* name = iter->name; + for (ObjCIdentifierListAST *iter = ast->protocol_refs->identifier_list; iter; iter = iter->next) { + NameAST* name = iter->value; Name *protocolName = semantic()->check(name, _scope); ObjCBaseProtocol *baseProtocol = control()->newObjCBaseProtocol(name->firstToken(), protocolName); protocol->addProtocol(baseProtocol); @@ -562,14 +562,14 @@ bool CheckDeclaration::visit(ObjCClassForwardDeclarationAST *ast) const unsigned sourceLocation = ast->firstToken(); List **symbolIter = &ast->symbols; - for (IdentifierListAST *it = ast->identifier_list; it; it = it->next) { + for (ObjCIdentifierListAST *it = ast->identifier_list; it; it = it->next) { unsigned declarationLocation; - if (it->name) - declarationLocation = it->name->firstToken(); + if (it->value) + declarationLocation = it->value->firstToken(); else declarationLocation = sourceLocation; - Name *className = semantic()->check(it->name, _scope); + Name *className = semantic()->check(it->value, _scope); ObjCForwardClassDeclaration *fwdClass = control()->newObjCForwardClassDeclaration(sourceLocation, className); fwdClass->setStartOffset(tokenAt(ast->firstToken()).offset); fwdClass->setEndOffset(tokenAt(ast->lastToken()).offset); @@ -612,8 +612,8 @@ bool CheckDeclaration::visit(ObjCClassDeclarationAST *ast) } if (ast->protocol_refs && ast->protocol_refs->identifier_list) { - for (IdentifierListAST *iter = ast->protocol_refs->identifier_list; iter; iter = iter->next) { - NameAST* name = iter->name; + for (ObjCIdentifierListAST *iter = ast->protocol_refs->identifier_list; iter; iter = iter->next) { + NameAST* name = iter->value; Name *protocolName = semantic()->check(name, _scope); ObjCBaseProtocol *baseProtocol = control()->newObjCBaseProtocol(name->firstToken(), protocolName); klass->addProtocol(baseProtocol); -- cgit v1.2.1