mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2015-06-03 18:13:41 -07:00
parent 16d9dd6ba7
commit 4cf72bb41b
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionSet.java
View file

@ -44,24 +44,24 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
private final CPPFunctionSet fFunctionSet; private final CPPFunctionSet fFunctionSet;
private final boolean fQualified; private final boolean fQualified;
private final boolean fAddressOf; private final boolean fAddressOf;
// Where an EvalFunctionSet is created for an expression of the form 'obj.member_function', // Where an EvalFunctionSet is created for an expression of the form 'obj.member_function',
// the type of 'obj' (needed for correct overload resolution of 'member_function' later). // the type of 'obj' (needed for correct overload resolution of 'member_function' later).
// Otherwise null. // Otherwise null.
private final IType fImpliedObjectType; private final IType fImpliedObjectType;
// Used to represent an EvalFunctionSet with zero functions. // Used to represent an EvalFunctionSet with zero functions.
// (We need the name in resolveFunction() - usually we get it from the CPPFunctionSet // (We need the name in resolveFunction() - usually we get it from the CPPFunctionSet
// by asking the first function in the set for its name.) // by asking the first function in the set for its name.)
// Exactly one of fFunctionSet and fName should be non-null. // Exactly one of fFunctionSet and fName should be non-null.
private final char[] fName; private final char[] fName;
public EvalFunctionSet(CPPFunctionSet set, boolean qualified, boolean addressOf, IType impliedObjectType, public EvalFunctionSet(CPPFunctionSet set, boolean qualified, boolean addressOf, IType impliedObjectType,
IASTNode pointOfDefinition) { IASTNode pointOfDefinition) {
this(set, qualified, addressOf, impliedObjectType, findEnclosingTemplate(pointOfDefinition)); this(set, qualified, addressOf, impliedObjectType, findEnclosingTemplate(pointOfDefinition));
} }
public EvalFunctionSet(CPPFunctionSet set, boolean qualified, boolean addressOf, IType impliedObjectType, public EvalFunctionSet(CPPFunctionSet set, boolean qualified, boolean addressOf, IType impliedObjectType,
IBinding templateDefinition) { IBinding templateDefinition) {
super(templateDefinition); super(templateDefinition);
fFunctionSet= set; fFunctionSet= set;
@ -70,11 +70,11 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
fImpliedObjectType= impliedObjectType; fImpliedObjectType= impliedObjectType;
fName= null; fName= null;
} }
public EvalFunctionSet(char[] name, boolean qualified, boolean addressOf, IASTNode pointOfDefinition) { public EvalFunctionSet(char[] name, boolean qualified, boolean addressOf, IASTNode pointOfDefinition) {
this(name, qualified, addressOf, findEnclosingTemplate(pointOfDefinition)); this(name, qualified, addressOf, findEnclosingTemplate(pointOfDefinition));
} }
public EvalFunctionSet(char[] name, boolean qualified, boolean addressOf, IBinding templateDefinition) { public EvalFunctionSet(char[] name, boolean qualified, boolean addressOf, IBinding templateDefinition) {
super(templateDefinition); super(templateDefinition);
fFunctionSet= null; fFunctionSet= null;
@ -87,15 +87,15 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
public CPPFunctionSet getFunctionSet() { public CPPFunctionSet getFunctionSet() {
return fFunctionSet; return fFunctionSet;
} }
public boolean isQualified() { public boolean isQualified() {
return fQualified; return fQualified;
} }
public boolean isAddressOf() { public boolean isAddressOf() {
return fAddressOf; return fAddressOf;
} }
public IType getImpliedObjectType() { public IType getImpliedObjectType() {
return fImpliedObjectType; return fImpliedObjectType;
} }
@ -132,7 +132,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
public boolean isValueDependent() { public boolean isValueDependent() {
return false; return false;
} }
@Override @Override
public boolean isConstantExpression(IASTNode point) { public boolean isConstantExpression(IASTNode point) {
if (fFunctionSet == null) if (fFunctionSet == null)
@ -165,7 +165,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
private final static short FLAG_HAS_FUNCTION_SET = ITypeMarshalBuffer.FLAG2; private final static short FLAG_HAS_FUNCTION_SET = ITypeMarshalBuffer.FLAG2;
private final static short FLAG_HAS_TEMPLATE_ARGS = ITypeMarshalBuffer.FLAG3; private final static short FLAG_HAS_TEMPLATE_ARGS = ITypeMarshalBuffer.FLAG3;
private final static short FLAG_QUALIFIED = ITypeMarshalBuffer.FLAG4; private final static short FLAG_QUALIFIED = ITypeMarshalBuffer.FLAG4;
@Override @Override
public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException { public void marshal(ITypeMarshalBuffer buffer, boolean includeValue) throws CoreException {
short firstBytes = ITypeMarshalBuffer.EVAL_FUNCTION_SET; short firstBytes = ITypeMarshalBuffer.EVAL_FUNCTION_SET;
@ -218,7 +218,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
} }
IType impliedObjectType= buffer.unmarshalType(); IType impliedObjectType= buffer.unmarshalType();
IBinding templateDefinition= buffer.unmarshalBinding(); IBinding templateDefinition= buffer.unmarshalBinding();
return new EvalFunctionSet(new CPPFunctionSet(bindings, args, null), qualified, addressOf, return new EvalFunctionSet(new CPPFunctionSet(bindings, args, null), qualified, addressOf,
impliedObjectType, templateDefinition); impliedObjectType, templateDefinition);
} else { } else {
char[] name = buffer.getCharArray(); char[] name = buffer.getCharArray();
@ -263,7 +263,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
// with an implied object type when that type is not dependent. // with an implied object type when that type is not dependent.
if (Arrays.equals(arguments, originalArguments) && functions == originalFunctions) if (Arrays.equals(arguments, originalArguments) && functions == originalFunctions)
return this; return this;
return new EvalFunctionSet(new CPPFunctionSet(functions, arguments, null), fQualified, fAddressOf, return new EvalFunctionSet(new CPPFunctionSet(functions, arguments, null), fQualified, fAddressOf,
fImpliedObjectType, getTemplateDefinition()); fImpliedObjectType, getTemplateDefinition());
} }
@ -296,17 +296,17 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
data.setFunctionArguments(false, args); data.setFunctionArguments(false, args);
if (fImpliedObjectType != null) if (fImpliedObjectType != null)
data.setImpliedObjectType(fImpliedObjectType); data.setImpliedObjectType(fImpliedObjectType);
try { try {
// Perform ADL if appropriate. // Perform ADL if appropriate.
if (!fQualified && fImpliedObjectType == null && !data.hasTypeOrMemberFunctionOrVariableResult()) { if (!fQualified && fImpliedObjectType == null && !data.hasTypeOrMemberFunctionOrVariableResult()) {
CPPSemantics.doKoenigLookup(data); CPPSemantics.doKoenigLookup(data);
Object[] foundItems = (Object[]) data.foundItems; Object[] foundItems = (Object[]) data.foundItems;
if (foundItems != null && (functions == null || foundItems.length > functions.length)) { if (foundItems != null && (functions == null || foundItems.length > functions.length)) {
// ADL found additional functions. // ADL found additional functions.
functions = Arrays.copyOf(foundItems, foundItems.length, ICPPFunction[].class); functions = Arrays.copyOf(foundItems, foundItems.length, ICPPFunction[].class);
// doKoenigLookup() may introduce duplicates into the result. These must be // doKoenigLookup() may introduce duplicates into the result. These must be
// eliminated to avoid resolveFunction() reporting an ambiguity. (Normally, when // eliminated to avoid resolveFunction() reporting an ambiguity. (Normally, when
// looukp() and doKoenigLookup() are called on the same LookupData object, the // looukp() and doKoenigLookup() are called on the same LookupData object, the