Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(249)

Unified Diff: pkg/analyzer/lib/src/generated/resolver.dart

Issue 689793003: Rename ForEachStatement.iterator -> iterable. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « pkg/analyzer/lib/src/generated/parser.dart ('k') | pkg/analyzer/lib/src/services/formatter_impl.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/resolver.dart
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
index c1c4bedc36ccce3ca813ed716201feaccce49c70..7e540342f7d9cabf476762df33bc87a9805837f9 100644
--- a/pkg/analyzer/lib/src/generated/resolver.dart
+++ b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -12950,7 +12950,7 @@ class ExitDetector extends GeneralizingAstVisitor<bool> {
bool outerBreakValue = _enclosingBlockContainsBreak;
_enclosingBlockContainsBreak = false;
try {
- return _nodeExits(node.iterator);
+ return _nodeExits(node.iterable);
} finally {
_enclosingBlockContainsBreak = outerBreakValue;
}
@@ -19806,8 +19806,8 @@ class ResolverVisitor extends ScopedVisitor {
// We visit the iterator before the loop variable because the loop variable cannot be in scope
// while visiting the iterator.
//
- Expression iterator = node.iterator;
- safelyVisit(iterator);
+ Expression iterable = node.iterable;
+ safelyVisit(iterable);
DeclaredIdentifier loopVariable = node.loopVariable;
SimpleIdentifier identifier = node.identifier;
safelyVisit(loopVariable);
@@ -19816,17 +19816,17 @@ class ResolverVisitor extends ScopedVisitor {
if (body != null) {
_overrideManager.enterScope();
try {
- if (loopVariable != null && iterator != null) {
+ if (loopVariable != null && iterable != null) {
LocalVariableElement loopElement = loopVariable.element;
if (loopElement != null) {
- DartType iteratorElementType = _getIteratorElementType(iterator);
+ DartType iteratorElementType = _getIteratorElementType(iterable);
overrideVariable(loopElement, iteratorElementType, true);
_recordPropagatedType(loopVariable.identifier, iteratorElementType);
}
- } else if (identifier != null && iterator != null) {
+ } else if (identifier != null && iterable != null) {
Element identifierElement = identifier.staticElement;
if (identifierElement is VariableElement) {
- DartType iteratorElementType = _getIteratorElementType(iterator);
+ DartType iteratorElementType = _getIteratorElementType(iterable);
overrideVariable(identifierElement, iteratorElementType, true);
_recordPropagatedType(identifier, iteratorElementType);
}
@@ -21084,7 +21084,7 @@ abstract class ScopedVisitor extends UnifyingAstVisitor<Object> {
// while visiting the iterator.
//
safelyVisit(node.identifier);
- safelyVisit(node.iterator);
+ safelyVisit(node.iterable);
safelyVisit(node.loopVariable);
visitStatementInScope(node.body);
}
« no previous file with comments | « pkg/analyzer/lib/src/generated/parser.dart ('k') | pkg/analyzer/lib/src/services/formatter_impl.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698