From 2d683cd2c30afa792df7b9d5095c89b88e3d2dfd Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Mon, 16 Aug 2010 11:38:34 +0200 Subject: Renamed DeclaratorAST::equals_token --- src/shared/cplusplus/AST.cpp | 8 ++++---- src/shared/cplusplus/AST.h | 4 ++-- src/shared/cplusplus/ASTClone.cpp | 2 +- src/shared/cplusplus/ASTMatcher.cpp | 2 +- src/shared/cplusplus/Bind.cpp | 2 +- src/shared/cplusplus/Parser.cpp | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/shared/cplusplus') diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index bfe4d2d325..80137c3260 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -896,8 +896,8 @@ unsigned DeclaratorAST::firstToken() const if (post_attribute_list) if (unsigned candidate = post_attribute_list->firstToken()) return candidate; - if (equals_token) - return equals_token; + if (equal_token) + return equal_token; if (initializer) if (unsigned candidate = initializer->firstToken()) return candidate; @@ -910,8 +910,8 @@ unsigned DeclaratorAST::lastToken() const if (initializer) if (unsigned candidate = initializer->lastToken()) return candidate; - if (equals_token) - return equals_token + 1; + if (equal_token) + return equal_token + 1; if (post_attribute_list) if (unsigned candidate = post_attribute_list->lastToken()) return candidate; diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h index 0e1ba53eeb..3f7a163c27 100644 --- a/src/shared/cplusplus/AST.h +++ b/src/shared/cplusplus/AST.h @@ -574,7 +574,7 @@ public: CoreDeclaratorAST *core_declarator; PostfixDeclaratorListAST *postfix_declarator_list; SpecifierListAST *post_attribute_list; - unsigned equals_token; + unsigned equal_token; ExpressionAST *initializer; public: @@ -584,7 +584,7 @@ public: , core_declarator(0) , postfix_declarator_list(0) , post_attribute_list(0) - , equals_token(0) + , equal_token(0) , initializer(0) {} diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/shared/cplusplus/ASTClone.cpp index 9b837e1384..27cc47605d 100644 --- a/src/shared/cplusplus/ASTClone.cpp +++ b/src/shared/cplusplus/ASTClone.cpp @@ -119,7 +119,7 @@ DeclaratorAST *DeclaratorAST::clone(MemoryPool *pool) const for (SpecifierListAST *iter = post_attribute_list, **ast_iter = &ast->post_attribute_list; iter; iter = iter->next, ast_iter = &(*ast_iter)->next) *ast_iter = new (pool) SpecifierListAST((iter->value) ? iter->value->clone(pool) : 0); - ast->equals_token = equals_token; + ast->equal_token = equal_token; if (initializer) ast->initializer = initializer->clone(pool); return ast; diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp index 5737bf0f53..7ca8582c33 100644 --- a/src/shared/cplusplus/ASTMatcher.cpp +++ b/src/shared/cplusplus/ASTMatcher.cpp @@ -175,7 +175,7 @@ bool ASTMatcher::match(DeclaratorAST *node, DeclaratorAST *pattern) else if (! AST::match(node->post_attribute_list, pattern->post_attribute_list, this)) return false; - pattern->equals_token = node->equals_token; + pattern->equal_token = node->equal_token; if (! pattern->initializer) pattern->initializer = node->initializer; diff --git a/src/shared/cplusplus/Bind.cpp b/src/shared/cplusplus/Bind.cpp index 5fbfa7febc..aba82b233b 100644 --- a/src/shared/cplusplus/Bind.cpp +++ b/src/shared/cplusplus/Bind.cpp @@ -1737,7 +1737,7 @@ bool Bind::visit(SimpleDeclarationAST *ast) if (Function *funTy = decl->type()->asFunctionType()) { funTy->setMethodKey(_methodKey); - if (funTy->isVirtual() && it->value->equals_token) + if (funTy->isVirtual() && it->value->equal_token) funTy->setPureVirtual(true); } } diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index fecaa7b394..bf192b69e8 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -1303,7 +1303,7 @@ bool Parser::parseDeclarator(DeclaratorAST *&node, bool stopAtCppInitializer) ExpressionAST *initializer = 0; bool blocked = blockErrors(true); - if (parseInitializer(initializer, &node->equals_token)) { + if (parseInitializer(initializer, &node->equal_token)) { NestedExpressionAST *expr = 0; if (initializer) expr = initializer->asNestedExpression(); @@ -2296,7 +2296,7 @@ bool Parser::parseInitDeclarator(DeclaratorAST *&node, } rewind(colon_token); } else if (LA() == T_EQUAL || (! acceptStructDeclarator && LA() == T_LPAREN)) { - parseInitializer(node->initializer, &node->equals_token); + parseInitializer(node->initializer, &node->equal_token); } return true; } @@ -2853,7 +2853,7 @@ bool Parser::isPointerDeclaration(DeclarationStatementAST *ast) const if (spec->value->asNamedTypeSpecifier() && ! spec->next) { if (DeclaratorListAST *declarators = declaration->declarator_list) { if (DeclaratorAST *declarator = declarators->value) { - if (declarator->ptr_operator_list && declarator->equals_token && declarator->initializer) { + if (declarator->ptr_operator_list && declarator->equal_token && declarator->initializer) { return true; } } @@ -2952,7 +2952,7 @@ bool Parser::parseCondition(ExpressionAST *&node) if (parseTypeSpecifier(type_specifier)) { DeclaratorAST *declarator = 0; if (parseInitDeclarator(declarator, /*acceptStructDeclarator=*/false)) { - if (declarator->initializer && declarator->equals_token) { + if (declarator->initializer && declarator->equal_token) { ConditionAST *ast = new (_pool) ConditionAST; ast->type_specifier_list = type_specifier; ast->declarator = declarator; -- cgit v1.2.1