From f9baa85a8b990efe26f0a0b078015737a399e6d5 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Thu, 31 Mar 2011 07:02:11 +0000 Subject: [PATCH] Cosmetics. --- .../core/dom/parser/cpp/CPPASTTemplateId.java | 8 +++--- .../core/dom/parser/cpp/CPPASTTypeId.java | 27 +++++++++---------- .../parser/cpp/CPPASTTypeIdExpression.java | 27 +++++++++---------- .../pdom/dom/cpp/PDOMCPPSpecialization.java | 5 ++-- 4 files changed, 32 insertions(+), 35 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java index a6b05cc27ef..ae367bf1e92 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java @@ -51,8 +51,8 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI } public CPPASTTemplateId copy(CopyStyle style) { - CPPASTTemplateId copy = new CPPASTTemplateId(templateName == null ? null - : templateName.copy(style)); + CPPASTTemplateId copy = new CPPASTTemplateId(templateName == null ? + null : templateName.copy(style)); for (IASTNode arg : getTemplateArguments()) copy.internalAddTemplateArgument(arg == null ? null : arg.copy(style)); copy.setOffsetAndLength(this); @@ -157,7 +157,7 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI @Override public boolean accept(ASTVisitor action) { if (action.shouldVisitNames) { - switch(action.visit(this)) { + switch (action.visit(this)) { case ASTVisitor.PROCESS_ABORT: return false; case ASTVisitor.PROCESS_SKIP: return true; default: break; @@ -170,7 +170,7 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI if (!nodes[i].accept(action)) return false; } if (action.shouldVisitNames) { - switch(action.leave(this)) { + switch (action.leave(this)) { case ASTVisitor.PROCESS_ABORT: return false; case ASTVisitor.PROCESS_SKIP: return true; default: break; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java index df257e248c2..7ea69ac9467 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java @@ -21,7 +21,6 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode; * Type id for c++ */ public class CPPASTTypeId extends ASTNode implements ICPPASTTypeId { - private IASTDeclSpecifier declSpec; private IASTDeclarator absDecl; private boolean isPackExpansion; @@ -87,23 +86,23 @@ public class CPPASTTypeId extends ASTNode implements ICPPASTTypeId { } @Override - public boolean accept( ASTVisitor action ){ - if( action.shouldVisitTypeIds ){ - 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.shouldVisitTypeIds) { + switch (action.visit(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } - if( declSpec != null ) if( !declSpec.accept( action ) ) return false; - if( absDecl != null ) if( !absDecl.accept( action ) ) return false; + if (declSpec != null && !declSpec.accept(action)) return false; + if (absDecl != null && !absDecl.accept(action)) return false; - if( action.shouldVisitTypeIds ){ - switch( action.leave( this ) ){ - case ASTVisitor.PROCESS_ABORT : return false; - case ASTVisitor.PROCESS_SKIP : return true; - default : break; + if (action.shouldVisitTypeIds) { + switch (action.leave(this)) { + case ASTVisitor.PROCESS_ABORT: return false; + case ASTVisitor.PROCESS_SKIP: return true; + default: break; } } return true; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java index 051ceebb50b..059b7e09420 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java @@ -22,7 +22,6 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpression { - private int op; private IASTTypeId typeId; @@ -71,22 +70,22 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr } @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; - 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; @@ -104,7 +103,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr } public boolean isLValue() { - switch(getOperator()) { + switch (getOperator()) { case op_typeid: return true; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java index 22d25b15eba..cda23286dc3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java @@ -31,7 +31,6 @@ import org.eclipse.core.runtime.CoreException; * Base class for specializations and instances of other bindings. */ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpecialization, IPDOMOverloader { - private static final int ARGMAP = PDOMCPPBinding.RECORD_SIZE + 0; private static final int SIGNATURE_HASH = PDOMCPPBinding.RECORD_SIZE + 4; private static final int SPECIALIZED = PDOMCPPBinding.RECORD_SIZE + 8; @@ -44,8 +43,8 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpeci private IBinding fSpecializedCache= null; private ICPPTemplateParameterMap fArgMap; - public PDOMCPPSpecialization(PDOMLinkage linkage, PDOMNode parent, ICPPSpecialization spec, IPDOMBinding specialized) - throws CoreException { + public PDOMCPPSpecialization(PDOMLinkage linkage, PDOMNode parent, ICPPSpecialization spec, + IPDOMBinding specialized) throws CoreException { super(linkage, parent, spec.getNameCharArray()); getDB().putRecPtr(record + SPECIALIZED, specialized.getRecord());