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

Rename doKoenigLookup() to doArgumentDependentLookup()

Browse source 
"Koenig lookup" is an obscure term for argument-dependent lookup.
We should use the standard terminology for ease of understanding.

Change-Id: Ife59e03eaf3497aeca4a685e37250529732a78b6
This commit is contained in:
Nathan Ridge 2017-03-03 19:05:52 -05:00
parent e99970f5ae
commit be635f520a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,7 +315,7 @@ public class CPPSemantics {
// Perform argument dependent lookup // Perform argument dependent lookup
if (data.checkAssociatedScopes() && !data.hasTypeOrMemberFunctionOrVariableResult()) { if (data.checkAssociatedScopes() && !data.hasTypeOrMemberFunctionOrVariableResult()) {
doKoenigLookup(data); doArgumentDependentLookup(data);
} }
} catch (DOMException e) { } catch (DOMException e) {
data.problem = (ProblemBinding) e.getProblem(); data.problem = (ProblemBinding) e.getProblem();
@ -625,7 +625,7 @@ public class CPPSemantics {
return false; return false;
} }
public static void doKoenigLookup(LookupData data) throws DOMException { public static void doArgumentDependentLookup(LookupData data) throws DOMException {
data.ignoreUsingDirectives = true; data.ignoreUsingDirectives = true;
// Set 'qualified' to true for the duration of this function call so the calls to lookup() // Set 'qualified' to true for the duration of this function call so the calls to lookup()
// don't ascend into enclosing scopes. // don't ascend into enclosing scopes.
@ -3805,7 +3805,7 @@ public class CPPSemantics {
return null; return null;
lookup(funcData, scope); lookup(funcData, scope);
try { try {
doKoenigLookup(funcData); doArgumentDependentLookup(funcData);
} catch (DOMException e) { } catch (DOMException e) {
} }

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

@ -311,7 +311,7 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
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.doArgumentDependentLookup(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)) {
@ -327,12 +327,12 @@ public class EvalFunctionSet extends CPPDependentEvaluation {
} }
} }
// doKoenigLookup() may introduce duplicates into the result. These must be // doArgumentDependentLookup() 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
// lookup() and doKoenigLookup() are called on the same LookupData object, the // lookup() and doArgumentDependentLookup() are called on the same LookupData object, the
// two functions coordinate using data stored in that object to eliminate // two functions coordinate using data stored in that object to eliminate
// duplicates, but in this case lookup() was called before with a different // duplicates, but in this case lookup() was called before with a different
// LookupData object and now we are only calling doKoenigLookup()). // LookupData object and now we are only calling doArgumentDependentLookup()).
functions = ArrayUtil.removeDuplicates(functions); functions = ArrayUtil.removeDuplicates(functions);
} }
} }