languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-06 00:59:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dartdevc] Support await within all CollectionElement nodes

Browse source 
This does not actually fix "await for" elements by itself but should in
combination with https://dart-review.googlesource.com/c/sdk/+/97521

Issue: #36005
Issue: #36006
Change-Id: I43380d44ec50197491cfe415291e7c2b6963079d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97565
Reviewed-by: Mark Zhou <markzipan@google.com>
This commit is contained in:
Nicholas Shahan 2019-03-23 00:08:36 +00:00
parent 59b8a9c4bb
commit bbe8adc827
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkg/dev_compiler/lib/src/analyzer/code_generator.dart
View file

@ -5794,13 +5794,32 @@ class CodeGenerator extends Object
/// })(), 10]
List<JS.Expression> _visitCollectionElementList(
Iterable<CollectionElement> nodes, DartType elementType) {
/// Returns [body] wrapped in a function and a call.
///
/// Alternatively if [body] contains a yield, will wrap body in a gerarator
/// fucntion, call it, and yield the result of [yieldType].
/// TODO(nshahan) Move to share between compilers. Need to work out a common
/// emitLibraryName().
JS.Expression detectYieldAndCall(
JS.Statement body, InterfaceType yieldType) {
var finder = YieldFinder();
body.accept(finder);
if (finder.hasYield) {
var genFn = JS.Fun([], body, isGenerator: true);
var asyncLibrary = emitLibraryName(types.futureType.element.library);
return JS.Yield(js.call(
'#.async(#, #)', [asyncLibrary, _emitType(yieldType), genFn]));
}
return JS.Call(JS.ArrowFun([], body), []);
}
var expressions = <JS.Expression>[];
for (var node in nodes) {
if (_isUiAsCodeElement(node)) {
// Create a temporary variable to build a new collection from.
var previousCollectionVariable = _currentCollectionVariable;
var temporaryIdentifier =
_createTemporary('items', _jsArray.type.instantiate([elementType]));
var arrayType = _jsArray.type.instantiate([elementType]);
var temporaryIdentifier = _createTemporary('items', arrayType);
_currentCollectionVariable = _emitSimpleIdentifier(temporaryIdentifier);
var items = js.statement('let # = #',
[_currentCollectionVariable, _emitList(elementType, [])]);
@ -5812,7 +5831,7 @@ class CodeGenerator extends Object
node.accept<JS.Node>(this),
JS.Return(_currentCollectionVariable)
]);
var functionCall = JS.Call(JS.ArrowFun([], functionBody), []);
var functionCall = detectYieldAndCall(functionBody, arrayType);
// Finally, spread the temporary control-flow-collections list.
expressions.add(JS.Spread(functionCall));
@ -6425,8 +6444,6 @@ class CodeGenerator extends Object
@override
JS.Statement visitForElement(ForElement node) {
// TODO(nshahan) Need to support await for in collections.
if (node.awaitKeyword != null) return _unreachable(node);
var jsBody = _isUiAsCodeElement(node.body)
? node.body.accept(this)
: _visitNestedCollectionElement(node.body);