From 6f80219d3e4a1e9cb1143535645bdbdd1d15c53c Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Tue, 23 Mar 2010 10:22:41 +0100
Subject: [PATCH] Renamed the CompoundExpressionAST::compoundStatement.
---
src/libs/cplusplus/ResolveExpression.cpp | 2 +-
src/shared/cplusplus/AST.cpp | 4 ++--
src/shared/cplusplus/AST.h | 4 ++--
src/shared/cplusplus/ASTClone.cpp | 4 ++--
src/shared/cplusplus/ASTMatcher.cpp | 6 +++---
src/shared/cplusplus/ASTVisit.cpp | 2 +-
src/shared/cplusplus/CheckExpression.cpp | 2 +-
src/shared/cplusplus/Parser.cpp | 6 +++---
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 8f05b78c366..0dc42ca9cca 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -295,7 +295,7 @@ bool ResolveExpression::visit(ThisExpressionAST *)
bool ResolveExpression::visit(CompoundExpressionAST *ast)
{
- CompoundStatementAST *cStmt = ast->compoundStatement;
+ CompoundStatementAST *cStmt = ast->statement;
if (cStmt && cStmt->statement_list) {
accept(cStmt->statement_list->lastValue());
}
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp
index 752a383a330..ac4734d6120 100644
--- a/src/shared/cplusplus/AST.cpp
+++ b/src/shared/cplusplus/AST.cpp
@@ -436,8 +436,8 @@ unsigned CompoundExpressionAST::lastToken() const
{
if (rparen_token)
return rparen_token + 1;
- else if (compoundStatement)
- return compoundStatement->lastToken();
+ else if (statement)
+ return statement->lastToken();
else
return lparen_token + 1;
}
diff --git a/src/shared/cplusplus/AST.h b/src/shared/cplusplus/AST.h
index d5e744c1756..dcdcf5923eb 100644
--- a/src/shared/cplusplus/AST.h
+++ b/src/shared/cplusplus/AST.h
@@ -963,13 +963,13 @@ class CPLUSPLUS_EXPORT CompoundExpressionAST: public ExpressionAST
{
public:
unsigned lparen_token;
- CompoundStatementAST *compoundStatement;
+ CompoundStatementAST *statement;
unsigned rparen_token;
public:
CompoundExpressionAST()
: lparen_token(0)
- , compoundStatement(0)
+ , statement(0)
, rparen_token(0)
{}
diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/shared/cplusplus/ASTClone.cpp
index 7920644c43d..a3df43854e3 100644
--- a/src/shared/cplusplus/ASTClone.cpp
+++ b/src/shared/cplusplus/ASTClone.cpp
@@ -277,8 +277,8 @@ CompoundExpressionAST *CompoundExpressionAST::clone(MemoryPool *pool) const
{
CompoundExpressionAST *ast = new (pool) CompoundExpressionAST;
ast->lparen_token = lparen_token;
- if (compoundStatement)
- ast->compoundStatement = compoundStatement->clone(pool);
+ if (statement)
+ ast->statement = statement->clone(pool);
ast->rparen_token = rparen_token;
return ast;
}
diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/shared/cplusplus/ASTMatcher.cpp
index e9734c661fe..612433d8dd6 100644
--- a/src/shared/cplusplus/ASTMatcher.cpp
+++ b/src/shared/cplusplus/ASTMatcher.cpp
@@ -434,9 +434,9 @@ bool ASTMatcher::match(CompoundExpressionAST *node, CompoundExpressionAST *patte
pattern->lparen_token = node->lparen_token;
- if (! pattern->compoundStatement)
- pattern->compoundStatement = node->compoundStatement;
- else if (! AST::match(node->compoundStatement, pattern->compoundStatement, this))
+ if (! pattern->statement)
+ pattern->statement = node->statement;
+ else if (! AST::match(node->statement, pattern->statement, this))
return false;
pattern->rparen_token = node->rparen_token;
diff --git a/src/shared/cplusplus/ASTVisit.cpp b/src/shared/cplusplus/ASTVisit.cpp
index f58974f0168..4c0a2e98d47 100644
--- a/src/shared/cplusplus/ASTVisit.cpp
+++ b/src/shared/cplusplus/ASTVisit.cpp
@@ -208,7 +208,7 @@ void BaseSpecifierAST::accept0(ASTVisitor *visitor)
void CompoundExpressionAST::accept0(ASTVisitor *visitor)
{
if (visitor->visit(this)) {
- accept(compoundStatement, visitor);
+ accept(statement, visitor);
}
visitor->endVisit(this);
}
diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index c9277c7939d..ecbf991c9ad 100644
--- a/src/shared/cplusplus/CheckExpression.cpp
+++ b/src/shared/cplusplus/CheckExpression.cpp
@@ -289,7 +289,7 @@ bool CheckExpression::visit(ThisExpressionAST *)
bool CheckExpression::visit(CompoundExpressionAST *ast)
{
- _fullySpecifiedType = semantic()->check(ast->compoundStatement, _scope);
+ _fullySpecifiedType = semantic()->check(ast->statement, _scope);
return false;
}
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index 363eb5e8080..91e634d624e 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -3573,12 +3573,12 @@ bool Parser::parsePrimaryExpression(ExpressionAST *&node)
ast->lparen_token = consumeToken();
StatementAST *statement = 0;
parseCompoundStatement(statement);
- ast->compoundStatement = statement->asCompoundStatement();
+ ast->statement = statement->asCompoundStatement();
match(T_RPAREN, &ast->rparen_token);
node = ast;
- if (ast->compoundStatement && ast->compoundStatement->statement_list) {
+ if (ast->statement && ast->statement->statement_list) {
// check that the last statement is an expression-statement
- StatementAST *lastStmt = ast->compoundStatement->statement_list->lastValue();
+ StatementAST *lastStmt = ast->statement->statement_list->lastValue();
if (!lastStmt || ! ast->asExpressionStatement())
_translationUnit->error(cursor(),
"expected an expression statement before token `%s'",
--
GitLab