From f5322a32d3e0323aebcdde8af546e11fd6eec9a3 Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Fri, 30 Nov 2018 22:05:22 -0500 Subject: [PATCH] Rename instantiateCommaSeparatedSubexpressions() to instantiateExpressions() instantiateCommaSeparatedSubexpressions() is a clunky name, and in C++17 (with fold expressions) the function will no longer be limited to comma- separated expressions. Change-Id: Id242f58bb291e79cefe2b28db12dbde4bafba4ed --- .../cpp/semantics/CPPDependentEvaluation.java | 18 +++++++++--------- .../parser/cpp/semantics/EvalFunctionCall.java | 2 +- .../dom/parser/cpp/semantics/EvalInitList.java | 2 +- .../dom/parser/cpp/semantics/EvalTypeId.java | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java index 952e08d75ce..38848aaa7cd 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPDependentEvaluation.java @@ -108,12 +108,12 @@ public abstract class CPPDependentEvaluation extends CPPEvaluation { * This code is similar to CPPTemplates.instantiateArguments(), but applies to evaluations * rather than template arguments. */ - protected static ICPPEvaluation[] instantiateCommaSeparatedSubexpressions(ICPPEvaluation[] subexpressions, - InstantiationContext context, int maxDepth) { - ICPPEvaluation[] result = subexpressions; + protected static ICPPEvaluation[] instantiateExpressions(ICPPEvaluation[] expressions, InstantiationContext context, + int maxDepth) { + ICPPEvaluation[] result = expressions; int resultShift = 0; - for (int i = 0; i < subexpressions.length; i++) { - ICPPEvaluation origEval = subexpressions[i]; + for (int i = 0; i < expressions.length; i++) { + ICPPEvaluation origEval = expressions[i]; ICPPEvaluation newEval; if (origEval instanceof EvalPackExpansion) { ICPPEvaluation pattern = ((EvalPackExpansion) origEval).getExpansionPattern(); @@ -129,7 +129,7 @@ public abstract class CPPDependentEvaluation extends CPPEvaluation { newEval = origEval.instantiate(context, maxDepth); } else { int shift = packSize - 1; - ICPPEvaluation[] newResult = new ICPPEvaluation[subexpressions.length + resultShift + shift]; + ICPPEvaluation[] newResult = new ICPPEvaluation[expressions.length + resultShift + shift]; System.arraycopy(result, 0, newResult, 0, i + resultShift); int oldPackOffset = context.getPackOffset(); for (int j = 0; j < packSize; ++j) { @@ -147,12 +147,12 @@ public abstract class CPPDependentEvaluation extends CPPEvaluation { newEval = origEval.instantiate(context, maxDepth); } - if (result != subexpressions) { + if (result != expressions) { result[i + resultShift] = newEval; } else if (newEval != origEval) { assert resultShift == 0; - result = new ICPPEvaluation[subexpressions.length]; - System.arraycopy(subexpressions, 0, result, 0, i); + result = new ICPPEvaluation[expressions.length]; + System.arraycopy(expressions, 0, result, 0, i); result[i] = newEval; } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java index 96465604670..6924190c166 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalFunctionCall.java @@ -229,7 +229,7 @@ public final class EvalFunctionCall extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(InstantiationContext context, int maxDepth) { - ICPPEvaluation[] args = instantiateCommaSeparatedSubexpressions(fArguments, context, maxDepth); + ICPPEvaluation[] args = instantiateExpressions(fArguments, context, maxDepth); if (args == fArguments) return this; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java index d5b4203afb9..dc14b763579 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalInitList.java @@ -138,7 +138,7 @@ public class EvalInitList extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(InstantiationContext context, int maxDepth) { - ICPPEvaluation[] clauses = instantiateCommaSeparatedSubexpressions(fClauses, context, maxDepth); + ICPPEvaluation[] clauses = instantiateExpressions(fClauses, context, maxDepth); if (clauses == fClauses) return this; return new EvalInitList(clauses, getTemplateDefinition()); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java index 407172f8f77..7cf484afb54 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/EvalTypeId.java @@ -379,7 +379,7 @@ public class EvalTypeId extends CPPDependentEvaluation { @Override public ICPPEvaluation instantiate(InstantiationContext context, int maxDepth) { - ICPPEvaluation[] args = instantiateCommaSeparatedSubexpressions(fArguments, context, maxDepth); + ICPPEvaluation[] args = instantiateExpressions(fArguments, context, maxDepth); IType type = CPPTemplates.instantiateType(fInputType, context); if (args == fArguments && type == fInputType) return this;