Rename variableLemma and variableType to clarify that they refer to the loop variable.
Addresses comment from https://dart-review.googlesource.com/c/sdk/+/61780.
Change-Id: I1e697030f44184b33cf67263118791592a3c3ba1
Reviewed-on: https://dart-review.googlesource.com/61900
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/pkg/analyzer/lib/src/fasta/resolution_storer.dart b/pkg/analyzer/lib/src/fasta/resolution_storer.dart
index 65e968d..e270b42 100644
--- a/pkg/analyzer/lib/src/fasta/resolution_storer.dart
+++ b/pkg/analyzer/lib/src/fasta/resolution_storer.dart
@@ -249,14 +249,15 @@
void iterator,
Token rightParenthesis,
void body,
- covariant VariableDeclarationLemma variableLemma,
- DartType variableType,
+ covariant VariableDeclarationLemma loopVariableLemma,
+ DartType loopVariableType,
Location writeLocation,
DartType writeType,
Declaration writeVariable,
Reference writeTarget) {
- if (variableLemma != null) {
- _store(variableLemma.fileOffset as Location, inferredType: variableType);
+ if (loopVariableLemma != null) {
+ _store(loopVariableLemma.fileOffset as Location,
+ inferredType: loopVariableType);
} else {
if (writeVariable != null) {
_store(writeLocation,
diff --git a/pkg/front_end/lib/src/fasta/kernel/factory.dart b/pkg/front_end/lib/src/fasta/kernel/factory.dart
index 52255d7..9d3bfb2 100644
--- a/pkg/front_end/lib/src/fasta/kernel/factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/factory.dart
@@ -138,8 +138,8 @@
Expression iterator,
Token rightParenthesis,
Statement body,
- covariant Object variableLemma,
- DartType variableType,
+ covariant Object loopVariableLemma,
+ DartType loopVariableType,
int writeOffset,
DartType writeVariableType,
int writeVariableDeclarationOffset,
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
index f74b1f7..4e13277 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_factory.dart
@@ -204,8 +204,8 @@
Expression iterator,
Token rightParenthesis,
Statement body,
- covariant Object variableLemma,
- DartType variableType,
+ covariant Object loopVariableLemma,
+ DartType loopVariableType,
int writeOffset,
DartType writeVariableType,
int writeVariableDeclarationOffset,
diff --git a/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart b/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
index 55bc689..5a0b1c4 100644
--- a/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/toplevel_inference_factory.dart
@@ -163,8 +163,8 @@
void iterator,
Token rightParenthesis,
void body,
- covariant void variableLemma,
- DartType variableType,
+ covariant void loopVariableLemma,
+ DartType loopVariableType,
int writeOffset,
DartType writeVariableType,
int writeVariableDeclarationOffset,
diff --git a/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart b/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
index 250746e..5f65703 100644
--- a/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
+++ b/pkg/front_end/lib/src/fasta/type_inference/type_inference_listener.dart
@@ -148,8 +148,8 @@
void iterator,
Token rightParenthesis,
void body,
- covariant Object variableLemma,
- DartType variableType,
+ covariant Object loopVariableLemma,
+ DartType loopVariableType,
Location writeLocation,
DartType writeVariableType,
Declaration writeVariable,
@@ -565,8 +565,8 @@
void iterator,
Token rightParenthesis,
void body,
- covariant void variableLemma,
- DartType variableType,
+ covariant void loopVariableLemma,
+ DartType loopVariableType,
writeLocation,
DartType writeVariableType,
writeVariable,