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

Unified Diff: pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart

Issue 1069983005: Model 'await for' as an explicit node in tree and fix its handling. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: fix failing assertion rebase Created 5 years, 8 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:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart
diff --git a/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart b/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart
index d740569c0a627a7605798dad2a13243c4e753dab..d58c45d71b612e03b445599dae08a21615201733 100644
--- a/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart
+++ b/pkg/compiler/lib/src/inferrer/simple_types_inferrer.dart
@@ -1189,7 +1189,7 @@ class SimpleTypeInferrerVisitor<T>
// Erroneous elements may be unresolved, for example missing getters.
if (Elements.isUnresolved(element)) return types.dynamicType;
// TODO(herhut): should we follow redirecting constructors here? We would
- // need to pay attention of the constructor is pointing to an erroneous
+ // need to pay attention if the constructor is pointing to an erroneous
// element.
return inferrer.registerCalledElement(
node, selector, outermostElement, element, arguments,
@@ -1329,18 +1329,12 @@ class SimpleTypeInferrerVisitor<T>
return null;
}
- T visitForIn(ast.ForIn node) {
- T expressionType = visit(node.expression);
- Selector iteratorSelector = elements.getIteratorSelector(node);
- Selector currentSelector = elements.getCurrentSelector(node);
- Selector moveNextSelector = elements.getMoveNextSelector(node);
-
- T iteratorType =
- handleDynamicSend(node, iteratorSelector, expressionType, null);
- handleDynamicSend(node, moveNextSelector,
- iteratorType, new ArgumentsTypes<T>([], null));
- T currentType =
- handleDynamicSend(node, currentSelector, iteratorType, null);
+ T handleForInLoop(ast.ForIn node, T iteratorType, Selector currentSelector,
+ Selector moveNextSelector) {
+ handleDynamicSend(node, moveNextSelector, iteratorType,
+ new ArgumentsTypes<T>.empty());
+ T currentType = handleDynamicSend(node, currentSelector, iteratorType,
+ new ArgumentsTypes<T>.empty());
if (node.expression.isThis()) {
// Any reasonable implementation of an iterator would expose
@@ -1366,4 +1360,35 @@ class SimpleTypeInferrerVisitor<T>
visit(node.body);
});
}
+
+ T visitAsyncForIn(ast.AsyncForIn node) {
+ T expressionType = visit(node.expression);
+
+ Selector currentSelector = elements.getCurrentSelector(node);
+ Selector moveNextSelector = elements.getMoveNextSelector(node);
+
+ js.JavaScriptBackend backend = compiler.backend;
+ Element ctor = backend.getStreamIteratorConstructor();
+
+ /// Synthesize a call to the [StreamIterator] constructor.
+ T iteratorType = handleStaticSend(node, null, ctor,
+ new ArgumentsTypes<T>([expressionType],
+ null));
+
+ return handleForInLoop(node, iteratorType, currentSelector,
+ moveNextSelector);
+ }
+
+ T visitSyncForIn(ast.SyncForIn node) {
+ T expressionType = visit(node.expression);
+ Selector iteratorSelector = elements.getIteratorSelector(node);
+ Selector currentSelector = elements.getCurrentSelector(node);
+ Selector moveNextSelector = elements.getMoveNextSelector(node);
+
+ T iteratorType = handleDynamicSend(node, iteratorSelector, expressionType,
+ new ArgumentsTypes<T>.empty());
+
+ return handleForInLoop(node, iteratorType, currentSelector,
+ moveNextSelector);
+ }
}
« no previous file with comments | « pkg/compiler/lib/src/inferrer/inferrer_visitor.dart ('k') | pkg/compiler/lib/src/inferrer/type_graph_nodes.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698