| Index: test/dart_codegen/expect/_internal/iterable.dart
|
| diff --git a/test/dart_codegen/expect/_internal/iterable.dart b/test/dart_codegen/expect/_internal/iterable.dart
|
| index 615551f63ea766216e669fe7b779f0e018e37771..a24973f64cd7237f0638132f176f312fceeb3890 100644
|
| --- a/test/dart_codegen/expect/_internal/iterable.dart
|
| +++ b/test/dart_codegen/expect/_internal/iterable.dart
|
| @@ -368,9 +368,7 @@ Iterable<dynamic> c(dynamic x0) => ((__x0) => DEVC$RT.cast(__x0, DEVC$RT.type((I
|
| }
|
| class ExpandIterator<S, T> implements Iterator<T> {final Iterator<S> _iterator;
|
| final _ExpandFunction _f;
|
| - Iterator<T> _currentExpansion = ((__x6) => DEVC$RT.cast(__x6, null, DEVC$RT.type((Iterator<T> _) {
|
| -}
|
| -), "InferableAllocation", """line 463, column 35 of dart:_internal/iterable.dart: """, __x6 is Iterator<T>, false))(const EmptyIterator());
|
| + Iterator<T> _currentExpansion = const EmptyIterator<T>();
|
| T _current;
|
| ExpandIterator(this._iterator, Iterable<T> this._f(S element));
|
| void _nextExpansion() {
|
| @@ -382,11 +380,11 @@ if (_currentExpansion == null) return false;
|
| _current = null;
|
| if (_iterator.moveNext()) {
|
| _currentExpansion = null;
|
| - _currentExpansion = ((__x7) => DEVC$RT.cast(__x7, DEVC$RT.type((Iterator<dynamic> _) {
|
| + _currentExpansion = ((__x6) => DEVC$RT.cast(__x6, DEVC$RT.type((Iterator<dynamic> _) {
|
| }
|
| ), DEVC$RT.type((Iterator<T> _) {
|
| }
|
| -), "CompositeCast", """line 481, column 29 of dart:_internal/iterable.dart: """, __x7 is Iterator<T>, false))(_f(_iterator.current).iterator);
|
| +), "CompositeCast", """line 481, column 29 of dart:_internal/iterable.dart: """, __x6 is Iterator<T>, false))(_f(_iterator.current).iterator);
|
| }
|
| else {
|
| return false;
|
| @@ -440,13 +438,13 @@ if (_remaining < 0) return null;
|
| final _ElementPredicate _f;
|
| TakeWhileIterable(this._iterable, bool this._f(E element));
|
| Iterator<E> get iterator {
|
| -return new TakeWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u8)) {
|
| +return new TakeWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u7)) {
|
| bool c(dynamic x0) => f(x0);
|
| return f == null ? null : c;
|
| }
|
| -, _f, null, DEVC$RT.type((__t9<E> _) {
|
| +, _f, null, DEVC$RT.type((__t8<E> _) {
|
| }
|
| -), "Wrap", """line 555, column 57 of dart:_internal/iterable.dart: """, _f is __t9<E>));
|
| +), "Wrap", """line 555, column 57 of dart:_internal/iterable.dart: """, _f is __t8<E>));
|
| }
|
| }
|
| class TakeWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
|
| @@ -513,13 +511,13 @@ for (int i = 0; i < _skipCount; i++) _iterator.moveNext();
|
| final _ElementPredicate _f;
|
| SkipWhileIterable(this._iterable, bool this._f(E element));
|
| Iterator<E> get iterator {
|
| -return new SkipWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u13)) {
|
| +return new SkipWhileIterator<E>(_iterable.iterator, DEVC$RT.wrap((bool f(dynamic __u12)) {
|
| bool c(dynamic x0) => f(x0);
|
| return f == null ? null : c;
|
| }
|
| -, _f, null, DEVC$RT.type((__t14<E> _) {
|
| +, _f, null, DEVC$RT.type((__t13<E> _) {
|
| }
|
| -), "Wrap", """line 648, column 57 of dart:_internal/iterable.dart: """, _f is __t14<E>));
|
| +), "Wrap", """line 648, column 57 of dart:_internal/iterable.dart: """, _f is __t13<E>));
|
| }
|
| }
|
| class SkipWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
|
| @@ -538,9 +536,7 @@ if (!_f(_iterator.current)) return true;
|
| E get current => _iterator.current;
|
| }
|
| class EmptyIterable<E> extends IterableBase<E> implements EfficientLength {const EmptyIterable();
|
| - Iterator<E> get iterator => ((__x16) => DEVC$RT.cast(__x16, null, DEVC$RT.type((Iterator<E> _) {
|
| -}
|
| -), "InferableAllocation", """line 678, column 31 of dart:_internal/iterable.dart: """, __x16 is Iterator<E>, false))(const EmptyIterator());
|
| + Iterator<E> get iterator => const EmptyIterator<E>();
|
| void forEach(void action(E element)) {
|
| }
|
| bool get isEmpty => true;
|
| @@ -772,13 +768,13 @@ return new WhereIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dynami
|
| }
|
| ), DEVC$RT.type((Iterable<T> _) {
|
| }
|
| -), "CompositeCast", """line 961, column 33 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u17)) {
|
| +), "CompositeCast", """line 961, column 33 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u15)) {
|
| bool c(dynamic x0) => f(x0);
|
| return f == null ? null : c;
|
| }
|
| -, f, null, DEVC$RT.type((__t18<T> _) {
|
| +, f, null, DEVC$RT.type((__t16<T> _) {
|
| }
|
| -), "Wrap", """line 961, column 43 of dart:_internal/iterable.dart: """, f is __t18<T>));
|
| +), "Wrap", """line 961, column 43 of dart:_internal/iterable.dart: """, f is __t16<T>));
|
| }
|
| static Iterable map(Iterable iterable, f(var element)) {
|
| return new MappedIterable(iterable, f);
|
| @@ -801,13 +797,13 @@ return new TakeWhileIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dy
|
| }
|
| ), DEVC$RT.type((Iterable<T> _) {
|
| }
|
| -), "CompositeCast", """line 983, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u20)) {
|
| +), "CompositeCast", """line 983, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u18)) {
|
| bool c(dynamic x0) => f(x0);
|
| return f == null ? null : c;
|
| }
|
| -, test, null, DEVC$RT.type((__t18<T> _) {
|
| +, test, null, DEVC$RT.type((__t16<T> _) {
|
| }
|
| -), "Wrap", """line 983, column 47 of dart:_internal/iterable.dart: """, test is __t18<T>));
|
| +), "Wrap", """line 983, column 47 of dart:_internal/iterable.dart: """, test is __t16<T>));
|
| }
|
| Iterable<T> skipList(List list, int n) {
|
| return new SubListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
|
| @@ -821,13 +817,13 @@ return new SkipWhileIterable<T>(DEVC$RT.cast(iterable, DEVC$RT.type((Iterable<dy
|
| }
|
| ), DEVC$RT.type((Iterable<T> _) {
|
| }
|
| -), "CompositeCast", """line 993, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u21)) {
|
| +), "CompositeCast", """line 993, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.wrap((bool f(dynamic __u19)) {
|
| bool c(dynamic x0) => f(x0);
|
| return f == null ? null : c;
|
| }
|
| -, test, null, DEVC$RT.type((__t18<T> _) {
|
| +, test, null, DEVC$RT.type((__t16<T> _) {
|
| }
|
| -), "Wrap", """line 993, column 47 of dart:_internal/iterable.dart: """, test is __t18<T>));
|
| +), "Wrap", """line 993, column 47 of dart:_internal/iterable.dart: """, test is __t16<T>));
|
| }
|
| Iterable<T> reversedList(List list) {
|
| return new ReversedListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
|
| @@ -989,7 +985,7 @@ result.add(element);
|
| }
|
| typedef Iterable<T> __t2<S, T>(S __u3);
|
| typedef Iterable<dynamic> __t4(dynamic __u5);
|
| - typedef bool __t9<E>(E __u10);
|
| - typedef bool __t11(dynamic __u12);
|
| - typedef bool __t14<E>(E __u15);
|
| - typedef bool __t18<T>(T __u19);
|
| + typedef bool __t8<E>(E __u9);
|
| + typedef bool __t10(dynamic __u11);
|
| + typedef bool __t13<E>(E __u14);
|
| + typedef bool __t16<T>(T __u17);
|
|
|