| 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 a24973f64cd7237f0638132f176f312fceeb3890..bec33f97e18146953a5c6d8440d327a5b1d53e2c 100644
|
| --- a/test/dart_codegen/expect/_internal/iterable.dart
|
| +++ b/test/dart_codegen/expect/_internal/iterable.dart
|
| @@ -354,17 +354,9 @@ return true;
|
| class ExpandIterable<S, T> extends IterableBase<T> {final Iterable<S> _iterable;
|
| final _ExpandFunction _f;
|
| ExpandIterable(this._iterable, Iterable<T> this._f(S element));
|
| - Iterator<T> get iterator => new ExpandIterator<S, T>(_iterable.iterator, DEVC$RT.wrap((Iterable<dynamic> f(dynamic __u1)) {
|
| -Iterable<dynamic> c(dynamic x0) => ((__x0) => DEVC$RT.cast(__x0, DEVC$RT.type((Iterable<dynamic> _) {
|
| + Iterator<T> get iterator => new ExpandIterator<S, T>(_iterable.iterator, DEVC$RT.cast(_f, null, DEVC$RT.type((__t0<S, T> _) {
|
| }
|
| -), DEVC$RT.type((Iterable<T> _) {
|
| -}
|
| -), "CastResult", """line 454, column 76 of dart:_internal/iterable.dart: """, __x0 is Iterable<T>, false))(f(x0));
|
| - return f == null ? null : c;
|
| -}
|
| -, _f, null, DEVC$RT.type((__t2<S, T> _) {
|
| -}
|
| -), "Wrap", """line 454, column 76 of dart:_internal/iterable.dart: """, _f is __t2<S, T>));
|
| +), "CompositeCast", """line 454, column 76 of dart:_internal/iterable.dart: """, _f is __t0<S, T>, false));
|
| }
|
| class ExpandIterator<S, T> implements Iterator<T> {final Iterator<S> _iterator;
|
| final _ExpandFunction _f;
|
| @@ -380,11 +372,11 @@ if (_currentExpansion == null) return false;
|
| _current = null;
|
| if (_iterator.moveNext()) {
|
| _currentExpansion = null;
|
| - _currentExpansion = ((__x6) => DEVC$RT.cast(__x6, DEVC$RT.type((Iterator<dynamic> _) {
|
| + _currentExpansion = ((__x4) => DEVC$RT.cast(__x4, DEVC$RT.type((Iterator<dynamic> _) {
|
| }
|
| ), DEVC$RT.type((Iterator<T> _) {
|
| }
|
| -), "CompositeCast", """line 481, column 29 of dart:_internal/iterable.dart: """, __x6 is Iterator<T>, false))(_f(_iterator.current).iterator);
|
| +), "CompositeCast", """line 481, column 29 of dart:_internal/iterable.dart: """, __x4 is Iterator<T>, false))(_f(_iterator.current).iterator);
|
| }
|
| else {
|
| return false;
|
| @@ -438,13 +430,9 @@ 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 __u7)) {
|
| -bool c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| -}
|
| -, _f, null, DEVC$RT.type((__t8<E> _) {
|
| +return new TakeWhileIterator<E>(_iterable.iterator, DEVC$RT.cast(_f, null, DEVC$RT.type((__t5<E> _) {
|
| }
|
| -), "Wrap", """line 555, column 57 of dart:_internal/iterable.dart: """, _f is __t8<E>));
|
| +), "CompositeCast", """line 555, column 57 of dart:_internal/iterable.dart: """, _f is __t5<E>, false));
|
| }
|
| }
|
| class TakeWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
|
| @@ -511,13 +499,9 @@ 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 __u12)) {
|
| -bool c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| +return new SkipWhileIterator<E>(_iterable.iterator, DEVC$RT.cast(_f, null, DEVC$RT.type((__t9<E> _) {
|
| }
|
| -, _f, null, DEVC$RT.type((__t13<E> _) {
|
| -}
|
| -), "Wrap", """line 648, column 57 of dart:_internal/iterable.dart: """, _f is __t13<E>));
|
| +), "CompositeCast", """line 648, column 57 of dart:_internal/iterable.dart: """, _f is __t9<E>, false));
|
| }
|
| }
|
| class SkipWhileIterator<E> extends Iterator<E> {final Iterator<E> _iterator;
|
| @@ -768,13 +752,9 @@ 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 __u15)) {
|
| -bool c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| -}
|
| -, f, null, DEVC$RT.type((__t16<T> _) {
|
| +), "CompositeCast", """line 961, column 33 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.cast(f, null, DEVC$RT.type((__t11<T> _) {
|
| }
|
| -), "Wrap", """line 961, column 43 of dart:_internal/iterable.dart: """, f is __t16<T>));
|
| +), "CompositeCast", """line 961, column 43 of dart:_internal/iterable.dart: """, f is __t11<T>, false));
|
| }
|
| static Iterable map(Iterable iterable, f(var element)) {
|
| return new MappedIterable(iterable, f);
|
| @@ -797,13 +777,9 @@ 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 __u18)) {
|
| -bool c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| +), "CompositeCast", """line 983, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.cast(test, null, DEVC$RT.type((__t11<T> _) {
|
| }
|
| -, test, null, DEVC$RT.type((__t16<T> _) {
|
| -}
|
| -), "Wrap", """line 983, column 47 of dart:_internal/iterable.dart: """, test is __t16<T>));
|
| +), "CompositeCast", """line 983, column 47 of dart:_internal/iterable.dart: """, test is __t11<T>, false));
|
| }
|
| Iterable<T> skipList(List list, int n) {
|
| return new SubListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
|
| @@ -817,13 +793,9 @@ 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 __u19)) {
|
| -bool c(dynamic x0) => f(x0);
|
| - return f == null ? null : c;
|
| -}
|
| -, test, null, DEVC$RT.type((__t16<T> _) {
|
| +), "CompositeCast", """line 993, column 37 of dart:_internal/iterable.dart: """, iterable is Iterable<T>, false), DEVC$RT.cast(test, null, DEVC$RT.type((__t11<T> _) {
|
| }
|
| -), "Wrap", """line 993, column 47 of dart:_internal/iterable.dart: """, test is __t16<T>));
|
| +), "CompositeCast", """line 993, column 47 of dart:_internal/iterable.dart: """, test is __t11<T>, false));
|
| }
|
| Iterable<T> reversedList(List list) {
|
| return new ReversedListIterable<T>(DEVC$RT.cast(list, DEVC$RT.type((List<dynamic> _) {
|
| @@ -983,9 +955,9 @@ result.add(element);
|
| static StateError tooMany() => new StateError("Too many elements");
|
| static StateError tooFew() => new StateError("Too few elements");
|
| }
|
| - typedef Iterable<T> __t2<S, T>(S __u3);
|
| - typedef Iterable<dynamic> __t4(dynamic __u5);
|
| - typedef bool __t8<E>(E __u9);
|
| - typedef bool __t10(dynamic __u11);
|
| - typedef bool __t13<E>(E __u14);
|
| - typedef bool __t16<T>(T __u17);
|
| + typedef Iterable<T> __t0<S, T>(S __u1);
|
| + typedef Iterable<dynamic> __t2(dynamic __u3);
|
| + typedef bool __t5<E>(E __u6);
|
| + typedef bool __t7(dynamic __u8);
|
| + typedef bool __t9<E>(E __u10);
|
| + typedef bool __t11<T>(T __u12);
|
|
|