mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-04-24 16:13:27 -07:00
parent 2afbff2520
commit 495b294449
2 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
View file

@ -25,12 +25,11 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent; import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
/** /**
* Implementation for designated initializers * Implementation for designated initializers.
*/ */
public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignatedInitializer, IASTAmbiguityParent { public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignatedInitializer, IASTAmbiguityParent {
private IASTInitializerClause rhs; private IASTInitializerClause rhs;
private ICASTDesignator [] designators = null; private ICASTDesignator[] designators;
private int designatorsPos = -1; private int designatorsPos = -1;
public CASTDesignatedInitializer() { public CASTDesignatedInitializer() {
@ -47,15 +46,12 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
@Override @Override
public CASTDesignatedInitializer copy(CopyStyle style) { public CASTDesignatedInitializer copy(CopyStyle style) {
CASTDesignatedInitializer copy = new CASTDesignatedInitializer(rhs == null ? null CASTDesignatedInitializer copy =
: rhs.copy(style)); new CASTDesignatedInitializer(rhs == null ? null : rhs.copy(style));
for (ICASTDesignator designator : getDesignators()) for (ICASTDesignator designator : getDesignators()) {
copy.addDesignator(designator == null ? null : designator.copy(style)); copy.addDesignator(designator == null ? null : designator.copy(style));
copy.setOffsetAndLength(this);
if (style == CopyStyle.withLocations) {
copy.setCopyLocation(this);
} }
return copy; return copy(copy, style);
} }
@Override @Override
@ -68,16 +64,14 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
} }
} }
@Override @Override
public ICASTDesignator[] getDesignators() { public ICASTDesignator[] getDesignators() {
if( designators == null ) return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY; if (designators == null)
return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY;
designators = ArrayUtil.trimAt(ICASTDesignator.class, designators, designatorsPos); designators = ArrayUtil.trimAt(ICASTDesignator.class, designators, designatorsPos);
return designators; return designators;
} }
@Override @Override
public IASTInitializerClause getOperand() { public IASTInitializerClause getOperand() {
return rhs; return rhs;
@ -131,9 +125,10 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
} }
ICASTDesignator[] ds = getDesignators(); ICASTDesignator[] ds = getDesignators();
for (int i = 0; i < ds.length; i++) { for (int i = 0; i < ds.length; i++) {
if( !ds[i].accept( action ) ) return false; if (!ds[i].accept(action))
return false;
} }
if( rhs != null ) if( !rhs.accept( action ) ) return false; if (rhs != null && !rhs.accept(action)) return false;
if (action.shouldVisitInitializers) { if (action.shouldVisitInitializers) {
switch (action.leave(this)) { switch (action.leave(this)) {