From eaabdd84c83a2f1ef2038b013f288c30e85748ef Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 1 Mar 2011 23:24:05 +0000 Subject: [PATCH] Cosmetics. --- .../parser/cpp/CPPASTBinaryExpression.java | 2 +- .../dom/parser/cpp/CPPASTCastExpression.java | 35 +++++++++---------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java index 9464c0bf991..db989a8de0c 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java @@ -180,7 +180,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr if (stack.fState == 0) { if (action.shouldVisitExpressions) { switch (action.visit(expr)) { - case ASTVisitor.PROCESS_ABORT : + case ASTVisitor.PROCESS_ABORT: return false; case ASTVisitor.PROCESS_SKIP: stack= stack.fNext; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java index fc41c04a261..f9d00d65129 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCastExpression.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * John Camelon (IBM) - Initial API and implementation - * Markus Schorn (Wind River Systems) + * John Camelon (IBM) - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; @@ -26,7 +26,7 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; /** - * Cast expression for c++ + * Cast expression for C++ */ public class CPPASTCastExpression extends ASTNode implements ICPPASTCastExpression, IASTAmbiguityParent { private int op; @@ -53,7 +53,6 @@ public class CPPASTCastExpression extends ASTNode implements ICPPASTCastExpressi copy.setOffsetAndLength(this); return copy; } - public void setTypeId(IASTTypeId typeId) { assertNotFrozen(); @@ -91,24 +90,24 @@ public class CPPASTCastExpression extends ASTNode implements ICPPASTCastExpressi } @Override - public boolean accept( ASTVisitor action ){ - if( action.shouldVisitExpressions ){ - switch( action.visit( this ) ){ - case ASTVisitor.PROCESS_ABORT : return false; - case ASTVisitor.PROCESS_SKIP : return true; - default : break; + public boolean accept(ASTVisitor action) { + if (action.shouldVisitExpressions) { + switch (action.visit(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } - if( typeId != null ) if( !typeId.accept( action ) ) return false; + if (typeId != null && !typeId.accept(action)) return false; IASTExpression op = getOperand(); - if( op != null ) if( !op.accept( action ) ) return false; + if (op != null && !op.accept(action)) return false; - if( action.shouldVisitExpressions ){ - switch( action.leave( this ) ){ - case ASTVisitor.PROCESS_ABORT : return false; - case ASTVisitor.PROCESS_SKIP : return true; - default : break; + if (action.shouldVisitExpressions) { + switch (action.leave(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } return true; @@ -141,6 +140,4 @@ public class CPPASTCastExpression extends ASTNode implements ICPPASTCastExpressi public boolean isLValue() { return getValueCategory() == LVALUE; } - - }