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 2012-08-14 10:02:18 -07:00
parent 2eb6b52047
commit 18128ed115
2 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
View file

@ -1226,7 +1226,8 @@ public class CPPSemantics {
return expandUsingDeclarationsAndRemoveObjects(bindings, data); return expandUsingDeclarationsAndRemoveObjects(bindings, data);
} }
private static IBinding[] expandUsingDeclarationsAndRemoveObjects(final IBinding[] bindings, LookupData data) { private static IBinding[] expandUsingDeclarationsAndRemoveObjects(final IBinding[] bindings,
LookupData data) {
if (bindings == null || bindings.length == 0) if (bindings == null || bindings.length == 0)
return IBinding.EMPTY_BINDING_ARRAY; return IBinding.EMPTY_BINDING_ARRAY;
@ -1304,9 +1305,10 @@ public class CPPSemantics {
} }
/** /**
* Stores the using directive with the scope where the members of the nominated namespace will appear. * Stores the using directive with the scope where the members of the nominated namespace will
* In case of an unqualified lookup the transitive directives are stored, also. This is important because * appear. In case of an unqualified lookup the transitive directives are stored, also.
* the members nominated by a transitive directive can appear before those of the original directive. * This is important because the members nominated by a transitive directive can appear before
* those of the original directive.
*/ */
private static void storeUsingDirective(LookupData data, ICPPNamespaceScope container, private static void storeUsingDirective(LookupData data, ICPPNamespaceScope container,
ICPPUsingDirective directive, Set<ICPPNamespaceScope> handled) throws DOMException { ICPPUsingDirective directive, Set<ICPPNamespaceScope> handled) throws DOMException {
@ -1333,8 +1335,8 @@ public class CPPSemantics {
listOfNominated.add(nominated); listOfNominated.add(nominated);
} }
// in a non-qualified lookup the transitive directive have to be stored right away, they may overtake the // In a non-qualified lookup the transitive directive have to be stored right away,
// container. // they may overtake the container.
if (!data.qualified || data.contentAssist) { if (!data.qualified || data.contentAssist) {
assert handled != null; assert handled != null;
if (tu != null) { if (tu != null) {
@ -1350,7 +1352,8 @@ public class CPPSemantics {
/** /**
* Computes the common enclosing scope of s1 and s2. * Computes the common enclosing scope of s1 and s2.
*/ */
private static ICPPScope getCommonEnclosingScope(IScope s1, IScope s2, ICPPASTTranslationUnit tu) throws DOMException { private static ICPPScope getCommonEnclosingScope(IScope s1, IScope s2, ICPPASTTranslationUnit tu)
throws DOMException {
ObjectSet<IScope> set = new ObjectSet<IScope>(2); ObjectSet<IScope> set = new ObjectSet<IScope>(2);
IScope parent= s1; IScope parent= s1;
while (parent != null) { while (parent != null) {
@ -1395,7 +1398,7 @@ public class CPPSemantics {
ICPPASTCompositeTypeSpecifier comp = (ICPPASTCompositeTypeSpecifier) parent; ICPPASTCompositeTypeSpecifier comp = (ICPPASTCompositeTypeSpecifier) parent;
nodes = comp.getMembers(); nodes = comp.getMembers();
} else if (parent instanceof ICPPASTNamespaceDefinition) { } else if (parent instanceof ICPPASTNamespaceDefinition) {
// need binding because namespaces can be split // Need binding because namespaces can be split.
CPPNamespace namespace = (CPPNamespace) ((ICPPASTNamespaceDefinition) parent).getName().resolveBinding(); CPPNamespace namespace = (CPPNamespace) ((ICPPASTNamespaceDefinition) parent).getName().resolveBinding();
namespaceDefs = namespace.getNamespaceDefinitions(); namespaceDefs = namespace.getNamespaceDefinitions();
nodes = ((ICPPASTNamespaceDefinition) namespaceDefs[++namespaceIdx].getParent()).getDeclarations(); nodes = ((ICPPASTNamespaceDefinition) namespaceDefs[++namespaceIdx].getParent()).getDeclarations();
@ -1491,7 +1494,7 @@ public class CPPSemantics {
item = null; item = null;
while (true) { while (true) {
if (namespaceDefs != null) { if (namespaceDefs != null) {
// check all definitions of this namespace // Check all definitions of this namespace.
while (++namespaceIdx < namespaceDefs.length) { while (++namespaceIdx < namespaceDefs.length) {
nodes = ((ICPPASTNamespaceDefinition) namespaceDefs[namespaceIdx].getParent()).getDeclarations(); nodes = ((ICPPASTNamespaceDefinition) namespaceDefs[namespaceIdx].getParent()).getDeclarations();
if (nodes.length > 0) { if (nodes.length > 0) {
@ -1501,7 +1504,7 @@ public class CPPSemantics {
} }
} }
} else if (parent instanceof IASTCompoundStatement && nodes instanceof IASTParameterDeclaration[]) { } else if (parent instanceof IASTCompoundStatement && nodes instanceof IASTParameterDeclaration[]) {
// function body, we were looking at parameters, now check the body itself // Function body, we were looking at parameters, now check the body itself.
IASTCompoundStatement compound = (IASTCompoundStatement) parent; IASTCompoundStatement compound = (IASTCompoundStatement) parent;
nodes = compound.getStatements(); nodes = compound.getStatements();
if (nodes.length > 0) { if (nodes.length > 0) {
@ -1561,7 +1564,7 @@ public class CPPSemantics {
innermost= dtor; innermost= dtor;
dtor= dtor.getNestedDeclarator(); dtor= dtor.getNestedDeclarator();
} }
if (innermost != null) { // could be null when content assist in the declSpec if (innermost != null) { // Could be null when content assist in the declSpec
IASTName declName = innermost.getName(); IASTName declName = innermost.getName();
ASTInternal.addName(scope, declName); ASTInternal.addName(scope, declName);
return; return;
@ -1635,8 +1638,7 @@ public class CPPSemantics {
ASTInternal.addName(scope, specName); ASTInternal.addName(scope, specName);
} }
} }
// Collect friends and elaborated type specifiers with declarators // Collect friends and elaborated type specifiers with declarators from nested classes.
// from nested classes
if (declarators.length > 0 || declSpec instanceof ICPPASTCompositeTypeSpecifier) { if (declarators.length > 0 || declSpec instanceof ICPPASTCompositeTypeSpecifier) {
switch (scopeKind) { switch (scopeKind) {
case eLocal: case eLocal:
@ -1698,7 +1700,6 @@ public class CPPSemantics {
* lookups the method assumes that transitive directives have been stored in the lookup-data. * lookups the method assumes that transitive directives have been stored in the lookup-data.
* For qualified lookups the transitive directives are considered if the lookup of the original * For qualified lookups the transitive directives are considered if the lookup of the original
* directive returns empty. * directive returns empty.
* @param fileSet
*/ */
private static void lookupInNominated(LookupData data, ICPPNamespaceScope scope) throws DOMException { private static void lookupInNominated(LookupData data, ICPPNamespaceScope scope) throws DOMException {
List<ICPPNamespaceScope> allNominated= data.usingDirectives.remove(scope); List<ICPPNamespaceScope> allNominated= data.usingDirectives.remove(scope);
@ -2678,7 +2679,7 @@ public class CPPSemantics {
if (argType == null) if (argType == null)
return null; return null;
final ValueCategory sourceIsLValue = isLValue[j+skipArg]; final ValueCategory sourceIsLValue = isLValue[j + skipArg];
IType paramType; IType paramType;
if (j < paramTypes.length) { if (j < paramTypes.length) {
@ -2708,7 +2709,8 @@ public class CPPSemantics {
} }
} }
} }
cost = Conversions.checkImplicitConversionSequence(paramType, argType, sourceIsLValue, udc, ctx, data.getLookupPoint()); cost = Conversions.checkImplicitConversionSequence(paramType, argType, sourceIsLValue,
udc, ctx, data.getLookupPoint());
if (data.fNoNarrowing && cost.isNarrowingConversion()) { if (data.fNoNarrowing && cost.isNarrowingConversion()) {
cost= Cost.NO_CONVERSION; cost= Cost.NO_CONVERSION;
} }
@ -2760,7 +2762,8 @@ public class CPPSemantics {
} }
/** /**
* 13.4-1 A use of an overloaded function without arguments is resolved in certain contexts to a function * 13.4-1 A use of an overloaded function without arguments is resolved in certain contexts to
* a function.
*/ */
static IBinding resolveTargetedFunction(IASTName name, CPPFunctionSet functionSet) { static IBinding resolveTargetedFunction(IASTName name, CPPFunctionSet functionSet) {
boolean addressOf= false; boolean addressOf= false;
@ -2818,7 +2821,8 @@ public class CPPSemantics {
LookupData data= new LookupData(name); LookupData data= new LookupData(name);
data.setFunctionArguments(false, init.getArguments()); data.setFunctionArguments(false, init.getArguments());
try { try {
IBinding ctor = CPPSemantics.resolveFunction(data, ClassTypeHelper.getConstructors((ICPPClassType) targetType, name), true); IBinding ctor = CPPSemantics.resolveFunction(data,
ClassTypeHelper.getConstructors((ICPPClassType) targetType, name), true);
if (ctor instanceof ICPPConstructor) { if (ctor instanceof ICPPConstructor) {
int i= 0; int i= 0;
for (IASTNode arg : init.getArguments()) { for (IASTNode arg : init.getArguments()) {
@ -2844,7 +2848,7 @@ public class CPPSemantics {
} else if (prop == IASTFunctionCallExpression.ARGUMENT) { } else if (prop == IASTFunctionCallExpression.ARGUMENT) {
// Target is a parameter of a function, need to resolve the function call // Target is a parameter of a function, need to resolve the function call
IASTFunctionCallExpression fnCall = (IASTFunctionCallExpression) parent; IASTFunctionCallExpression fnCall = (IASTFunctionCallExpression) parent;
IType t= SemanticUtil.getNestedType(fnCall.getFunctionNameExpression().getExpressionType(), TDEF|REF|CVTYPE); IType t= SemanticUtil.getNestedType(fnCall.getFunctionNameExpression().getExpressionType(), TDEF | REF | CVTYPE);
if (t instanceof IPointerType) { if (t instanceof IPointerType) {
t= SemanticUtil.getNestedType(((IPointerType) t).getType(), TDEF | REF | CVTYPE); t= SemanticUtil.getNestedType(((IPointerType) t).getType(), TDEF | REF | CVTYPE);
} }
@ -2937,9 +2941,11 @@ public class CPPSemantics {
try { try {
if (fn instanceof ICPPFunctionTemplate) { if (fn instanceof ICPPFunctionTemplate) {
final ICPPFunctionTemplate template = (ICPPFunctionTemplate) fn; final ICPPFunctionTemplate template = (ICPPFunctionTemplate) fn;
ICPPFunction inst= CPPTemplates.instantiateForAddressOfFunction(template, (ICPPFunctionType) targetType, set.getTemplateArguments(), point); ICPPFunction inst= CPPTemplates.instantiateForAddressOfFunction(template,
(ICPPFunctionType) targetType, set.getTemplateArguments(), point);
if (inst != null) { if (inst != null) {
int cmp= CPPTemplates.orderFunctionTemplates(resultTemplate, template, TypeSelection.PARAMETERS_AND_RETURN_TYPE, point); int cmp= CPPTemplates.orderFunctionTemplates(resultTemplate, template,
TypeSelection.PARAMETERS_AND_RETURN_TYPE, point);
if (cmp == 0) if (cmp == 0)
cmp= compareByRelevance(tu, resultTemplate, template); cmp= compareByRelevance(tu, resultTemplate, template);
@ -2962,7 +2968,8 @@ public class CPPSemantics {
return result; return result;
} }
public static ICPPFunction findOverloadedBinaryOperator(IASTNode point, OverloadableOperator op, ICPPEvaluation arg1, ICPPEvaluation arg2) { public static ICPPFunction findOverloadedBinaryOperator(IASTNode point, OverloadableOperator op,
ICPPEvaluation arg1, ICPPEvaluation arg2) {
if (op == null || arg1 == null || arg2 == null) if (op == null || arg1 == null || arg2 == null)
return null; return null;