| Index: test/generated_sdk/lib/core/list.dart
|
| diff --git a/test/generated_sdk/lib/core/list.dart b/test/generated_sdk/lib/core/list.dart
|
| index c693ba1f05b9632e9d6b44b49b0ec18b97847370..512ba3225a254119018bc7ced6883db5bd264fc5 100644
|
| --- a/test/generated_sdk/lib/core/list.dart
|
| +++ b/test/generated_sdk/lib/core/list.dart
|
| @@ -51,9 +51,7 @@ part of dart.core;
|
| * directly or through iterating an [Iterable] that is backed by the list, will
|
| * break the iteration.
|
| */
|
| -@SupportJsExtensionMethod()
|
| -@JsPeerInterface(name: 'Array')
|
| -abstract class List<E> implements Iterable<E>, EfficientLength {
|
| +abstract class List<E> implements Iterable<E> {
|
| /**
|
| * Creates a list of the given length.
|
| *
|
| @@ -86,14 +84,9 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| if ((length is !int) || (length < 0)) {
|
| throw new ArgumentError("Length must be a non-negative integer: $length");
|
| }
|
| - list = JS('', 'new Array(#)', length);
|
| - // TODO(jmesserly): consider a fixed array subclass instead.
|
| - JS('void', r'#.fixed$length = Array', list);
|
| + list = JSArray.markFixedList(JS('', 'new Array(#)', length));
|
| }
|
| - // TODO(jmesserly): skip this when E is dynamic and Object.
|
| - JS('void', 'dart.setType(#, List\$(#))', list, E);
|
| - // TODO(jmesserly): compiler creates a bogus type check here.
|
| - return list;
|
| + return new JSArray<E>.typed(list);
|
| }
|
|
|
| /**
|
| @@ -143,7 +136,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * The created list is fixed-length unless [growable] is true.
|
| */
|
| factory List.generate(int length, E generator(int index),
|
| - { bool growable: true }) {
|
| + { bool growable: true }) {
|
| List<E> result;
|
| if (growable) {
|
| result = <E>[]..length = length;
|
| @@ -156,166 +149,24 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| return result;
|
| }
|
|
|
| - checkMutable(reason) {
|
| - /* TODO(jacobr): implement.
|
| - if (this is !JSMutableArray) {
|
| - throw new UnsupportedError(reason);
|
| - }
|
| - * */
|
| - }
|
| -
|
| - checkGrowable(reason) {
|
| - /* TODO(jacobr): implement
|
| - if (this is !JSExtendableArray) {
|
| - throw new UnsupportedError(reason);
|
| - }
|
| - * */
|
| - }
|
| -
|
| - Iterable<E> where(bool f(E element)) {
|
| - return new IterableMixinWorkaround<E>().where(this, f);
|
| - }
|
| -
|
| - Iterable expand(Iterable f(E element)) {
|
| - return IterableMixinWorkaround.expand(this, f);
|
| - }
|
| -
|
| - void forEach(void f(E element)) {
|
| - int length = this.length;
|
| - for (int i = 0; i < length; i++) {
|
| - f(JS('', '#[#]', this, i));
|
| - if (length != this.length) {
|
| - throw new ConcurrentModificationError(this);
|
| - }
|
| - }
|
| - }
|
| -
|
| - Iterable map(f(E element)) {
|
| - return IterableMixinWorkaround.mapList(this, f);
|
| - }
|
| -
|
| - String join([String separator = ""]) {
|
| - var list = new List(this.length);
|
| - for (int i = 0; i < this.length; i++) {
|
| - list[i] = "${this[i]}";
|
| - }
|
| - return JS('String', "#.join(#)", list, separator);
|
| - }
|
| -
|
| - Iterable<E> take(int n) {
|
| - return new IterableMixinWorkaround<E>().takeList(this, n);
|
| - }
|
| -
|
| - Iterable<E> takeWhile(bool test(E value)) {
|
| - return new IterableMixinWorkaround<E>().takeWhile(this, test);
|
| - }
|
| -
|
| - Iterable<E> skip(int n) {
|
| - return new IterableMixinWorkaround<E>().skipList(this, n);
|
| - }
|
| -
|
| - Iterable<E> skipWhile(bool test(E value)) {
|
| - return new IterableMixinWorkaround<E>().skipWhile(this, test);
|
| - }
|
| -
|
| - E reduce(E combine(E value, E element)) {
|
| - return IterableMixinWorkaround.reduce(this, combine);
|
| - }
|
| -
|
| - fold(initialValue, combine(previousValue, E element)) {
|
| - return IterableMixinWorkaround.fold(this, initialValue, combine);
|
| - }
|
| -
|
| - E firstWhere(bool test(E value), {E orElse()}) {
|
| - return IterableMixinWorkaround.firstWhere(this, test, orElse);
|
| - }
|
| -
|
| - E lastWhere(bool test(E value), {E orElse()}) {
|
| - return IterableMixinWorkaround.lastWhereList(this, test, orElse);
|
| - }
|
| -
|
| - E singleWhere(bool test(E value)) {
|
| - return IterableMixinWorkaround.singleWhere(this, test);
|
| - }
|
| -
|
| - E elementAt(int index) {
|
| - return this[index];
|
| - }
|
| -
|
| - E get first {
|
| - if (length > 0) return this[0];
|
| - throw new StateError("No elements");
|
| - }
|
| -
|
| - E get last {
|
| - if (length > 0) return this[length - 1];
|
| - throw new StateError("No elements");
|
| - }
|
| -
|
| - E get single {
|
| - if (length == 1) return this[0];
|
| - if (length == 0) throw new StateError("No elements");
|
| - throw new StateError("More than one element");
|
| - }
|
| -
|
| - bool any(bool f(E element)) => IterableMixinWorkaround.any(this, f);
|
| -
|
| - bool every(bool f(E element)) => IterableMixinWorkaround.every(this, f);
|
| -
|
| - bool contains(Object other) {
|
| - for (int i = 0; i < length; i++) {
|
| - if (this[i] == other) return true;
|
| - }
|
| - return false;
|
| - }
|
| -
|
| - bool get isEmpty => length == 0;
|
| -
|
| - bool get isNotEmpty => !isEmpty;
|
| -
|
| - String toString() => ListBase.listToString(this);
|
| -
|
| - List<E> toList({ bool growable: true }) {
|
| - // TODO(vsm): Enforce growable / non-growable.
|
| - // See: https://github.com/dart-lang/dev_compiler/issues/175
|
| - return JS('', 'dart.setType(#.slice(), core.List\$(#))', this, E);
|
| - }
|
| -
|
| - Set<E> toSet() => new Set<E>.from(this);
|
| -
|
| - Iterator<E> get iterator => new ListIterator<E>(this);
|
| -
|
| - int get hashCode => Primitives.objectHashCode(this);
|
| -
|
| - // BORDER XXXX
|
| -
|
| /**
|
| * Returns the object at the given [index] in the list
|
| * or throws a [RangeError] if [index] is out of bounds.
|
| */
|
| - E operator [](int index) {
|
| - if (index is !int) throw new ArgumentError(index);
|
| - if (index >= length || index < 0) throw new RangeError.value(index);
|
| - return JS('var', '#[#]', this, index);
|
| - }
|
| + E operator [](int index);
|
|
|
| /**
|
| * Sets the value at the given [index] in the list to [value]
|
| * or throws a [RangeError] if [index] is out of bounds.
|
| */
|
| - void operator []=(int index, E value) {
|
| - checkMutable('indexed set');
|
| - if (index is !int) throw new ArgumentError(index);
|
| - if (index >= length || index < 0) throw new RangeError.value(index);
|
| - JS('void', r'#[#] = #', this, index, value);
|
| - }
|
| + void operator []=(int index, E value);
|
|
|
| /**
|
| * Returns the number of objects in this list.
|
| *
|
| * The valid indices for a list are `0` through `length - 1`.
|
| */
|
| - int get length => JS('JSUInt32', r'#.length', this);
|
| + int get length;
|
|
|
| /**
|
| * Changes the length of this list.
|
| @@ -325,12 +176,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * Throws an [UnsupportedError] if the list is fixed-length.
|
| */
|
| - void set length(int newLength) {
|
| - if (newLength is !int) throw new ArgumentError(newLength);
|
| - if (newLength < 0) throw new RangeError.value(newLength);
|
| - checkGrowable('set length');
|
| - JS('void', r'#.length = #', this, newLength);
|
| - }
|
| + void set length(int newLength);
|
|
|
| /**
|
| * Adds [value] to the end of this list,
|
| @@ -338,10 +184,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * Throws an [UnsupportedError] if the list is fixed-length.
|
| */
|
| - void add(E value) {
|
| - checkGrowable('add');
|
| - JS('void', r'#.push(#)', this, value);
|
| - }
|
| + void add(E value);
|
|
|
| /**
|
| * Appends all objects of [iterable] to the end of this list.
|
| @@ -349,23 +192,17 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * Extends the length of the list by the number of objects in [iterable].
|
| * Throws an [UnsupportedError] if this list is fixed-length.
|
| */
|
| - void addAll(Iterable<E> iterable) {
|
| - for (E e in iterable) {
|
| - this.add(e);
|
| - }
|
| - }
|
| + void addAll(Iterable<E> iterable);
|
|
|
| /**
|
| * Returns an [Iterable] of the objects in this list in reverse order.
|
| */
|
| - Iterable<E> get reversed =>
|
| - new IterableMixinWorkaround<E>().reversedList(this);
|
| + Iterable<E> get reversed;
|
|
|
| /**
|
| * Sorts this list according to the order specified by the [compare] function.
|
| *
|
| * The [compare] function must act as a [Comparator].
|
| -
|
| * List<String> numbers = ['one', 'two', 'three', 'four'];
|
| * // Sort from shortest to longest.
|
| * numbers.sort((x, y) => x.length.compareTo(y.length));
|
| @@ -376,19 +213,14 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * List<int> nums = [13, 2, -11];
|
| * nums.sort();
|
| - nums.join(', '); // '-11, 2, 13'
|
| + nums.join(', '); // '-11, 2, 13'
|
| */
|
| - void sort([int compare(E a, E b)]) {
|
| - checkMutable('sort');
|
| - IterableMixinWorkaround.sortList(this, compare);
|
| - }
|
| + void sort([int compare(E a, E b)]);
|
|
|
| /**
|
| * Shuffles the elements of this list randomly.
|
| */
|
| - void shuffle([Random random]) {
|
| - IterableMixinWorkaround.shuffleList(this, random);
|
| - }
|
| + void shuffle([Random random]);
|
|
|
| /**
|
| * Returns the first index of [element] in this list.
|
| @@ -405,9 +237,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * notes.indexOf('fa'); // -1
|
| */
|
| - int indexOf(E element, [int start = 0]) {
|
| - return IterableMixinWorkaround.indexOfList(this, element, start);
|
| - }
|
| + int indexOf(E element, [int start = 0]);
|
|
|
| /**
|
| * Returns the last index of [element] in this list.
|
| @@ -429,9 +259,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * notes.lastIndexOf('fa'); // -1
|
| */
|
| - int lastIndexOf(E element, [int start]) {
|
| - return IterableMixinWorkaround.lastIndexOfList(this, element, start);
|
| - }
|
| + int lastIndexOf(E element, [int start]);
|
|
|
| /**
|
| * Removes all objects from this list;
|
| @@ -440,9 +268,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * Throws an [UnsupportedError], and retains all objects, if this
|
| * is a fixed-length list.
|
| */
|
| - void clear() {
|
| - length = 0;
|
| - }
|
| + void clear();
|
|
|
| /**
|
| * Inserts the object at position [index] in this list.
|
| @@ -453,15 +279,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * An error occurs if the [index] is less than 0 or greater than length.
|
| * An [UnsupportedError] occurs if the list is fixed-length.
|
| */
|
| - void insert(int index, E element) {
|
| - if (index is !int) throw new ArgumentError(index);
|
| - if (index < 0 || index > length) {
|
| - throw new RangeError.value(index);
|
| - }
|
| - checkGrowable('insert');
|
| - JS('void', r'#.splice(#, 0, #)', this, index, element);
|
| - }
|
| -
|
| + void insert(int index, E element);
|
|
|
| /**
|
| * Inserts all objects of [iterable] at position [index] in this list.
|
| @@ -472,10 +290,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * An error occurs if the [index] is less than 0 or greater than length.
|
| * An [UnsupportedError] occurs if the list is fixed-length.
|
| */
|
| - void insertAll(int index, Iterable<E> iterable) {
|
| - checkGrowable('insertAll');
|
| - IterableMixinWorkaround.insertAllList(this, index, iterable);
|
| - }
|
| + void insertAll(int index, Iterable<E> iterable);
|
|
|
| /**
|
| * Overwrites objects of `this` with the objects of [iterable], starting
|
| @@ -495,10 +310,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * If `iterable` is based on this list, its values may change /during/ the
|
| * `setAll` operation.
|
| */
|
| - void setAll(int index, Iterable<E> iterable) {
|
| - checkMutable('setAll');
|
| - IterableMixinWorkaround.setAllList(this, index, iterable);
|
| - }
|
| + void setAll(int index, Iterable<E> iterable);
|
|
|
| /**
|
| * Removes the first occurence of [value] from this list.
|
| @@ -517,16 +329,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * An [UnsupportedError] occurs if the list is fixed-length.
|
| */
|
| - bool remove(Object element) {
|
| - checkGrowable('remove');
|
| - for (int i = 0; i < this.length; i++) {
|
| - if (this[i] == value) {
|
| - JS('var', r'#.splice(#, 1)', this, i);
|
| - return true;
|
| - }
|
| - }
|
| - return false;
|
| - }
|
| + bool remove(Object value);
|
|
|
| /**
|
| * Removes the object at position [index] from this list.
|
| @@ -541,25 +344,14 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * Throws an [UnsupportedError] if this is a fixed-length list. In that case
|
| * the list is not modified.
|
| */
|
| - E removeAt(int index) {
|
| - if (index is !int) throw new ArgumentError(index);
|
| - if (index < 0 || index >= length) {
|
| - throw new RangeError.value(index);
|
| - }
|
| - checkGrowable('removeAt');
|
| - return JS('var', r'#.splice(#, 1)[0]', this, index);
|
| - }
|
| + E removeAt(int index);
|
|
|
| /**
|
| * Pops and returns the last object in this list.
|
| *
|
| * Throws an [UnsupportedError] if this is a fixed-length list.
|
| */
|
| - E removeLast() {
|
| - checkGrowable('removeLast');
|
| - if (length == 0) throw new RangeError.value(-1);
|
| - return JS('var', r'#.pop()', this);
|
| - }
|
| + E removeLast();
|
|
|
| /**
|
| * Removes all objects from this list that satisfy [test].
|
| @@ -572,11 +364,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * Throws an [UnsupportedError] if this is a fixed-length list.
|
| */
|
| - void removeWhere(bool test(E element)) {
|
| - // This could, and should, be optimized.
|
| - IterableMixinWorkaround.removeWhereList(this, test);
|
| - }
|
| -
|
| + void removeWhere(bool test(E element));
|
|
|
| /**
|
| * Removes all objects from this list that fail to satisfy [test].
|
| @@ -589,10 +377,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * Throws an [UnsupportedError] if this is a fixed-length list.
|
| */
|
| - void retainWhere(bool test(E element)) {
|
| - IterableMixinWorkaround.removeWhereList(this,
|
| - (E element) => !test(element));
|
| - }
|
| + void retainWhere(bool test(E element));
|
|
|
| /**
|
| * Returns a new list containing the objects from [start] inclusive to [end]
|
| @@ -608,24 +393,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * An error occurs if [start] is outside the range `0` .. `length` or if
|
| * [end] is outside the range `start` .. `length`.
|
| */
|
| - List<E> sublist(int start, [int end]) {
|
| - checkNull(start); // TODO(ahe): This is not specified but co19 tests it.
|
| - if (start is !int) throw new ArgumentError(start);
|
| - if (start < 0 || start > length) {
|
| - throw new RangeError.range(start, 0, length);
|
| - }
|
| - if (end == null) {
|
| - end = length;
|
| - } else {
|
| - if (end is !int) throw new ArgumentError(end);
|
| - if (end < start || end > length) {
|
| - throw new RangeError.range(end, start, length);
|
| - }
|
| - }
|
| - if (start == end) return <E>[];
|
| - return new JSArray<E>.markGrowable(
|
| - JS('', r'#.slice(#, #)', this, start, end));
|
| - }
|
| + List<E> sublist(int start, [int end]);
|
|
|
| /**
|
| * Returns an [Iterable] that iterates over the objects in the range
|
| @@ -644,10 +412,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * colors.length = 3;
|
| * range.join(', '); // 'green, blue'
|
| */
|
| - Iterable<E> getRange(int start, int end) {
|
| - return new IterableMixinWorkaround<E>().getRangeList(this, start, end);
|
| - }
|
| -
|
| + Iterable<E> getRange(int start, int end);
|
|
|
| /**
|
| * Copies the objects of [iterable], skipping [skipCount] objects first,
|
| @@ -673,10 +438,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * If `iterable` depends on this list in some other way, no guarantees are
|
| * made.
|
| */
|
| - void setRange(int start, int end, Iterable<E> iterable, [int skipCount = 0]) {
|
| - checkMutable('set range');
|
| - IterableMixinWorkaround.setRangeList(this, start, end, iterable, skipCount);
|
| - }
|
| + void setRange(int start, int end, Iterable<E> iterable, [int skipCount = 0]);
|
|
|
| /**
|
| * Removes the objects in the range [start] inclusive to [end] exclusive.
|
| @@ -687,22 +449,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * Throws an [UnsupportedError] if this is a fixed-length list. In that case
|
| * the list is not modified.
|
| */
|
| - void removeRange(int start, int end) {
|
| - checkGrowable('removeRange');
|
| - int receiverLength = this.length;
|
| - if (start < 0 || start > receiverLength) {
|
| - throw new RangeError.range(start, 0, receiverLength);
|
| - }
|
| - if (end < start || end > receiverLength) {
|
| - throw new RangeError.range(end, start, receiverLength);
|
| - }
|
| - Lists.copy(this,
|
| - end,
|
| - this,
|
| - start,
|
| - receiverLength - end);
|
| - this.length = receiverLength - (end - start);
|
| - }
|
| + void removeRange(int start, int end);
|
|
|
| /**
|
| * Sets the objects in the range [start] inclusive to [end] exclusive
|
| @@ -710,10 +457,7 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| *
|
| * An error occurs if [start]..[end] is not a valid range for `this`.
|
| */
|
| - void fillRange(int start, int end, [E fillValue]) {
|
| - checkMutable('fill range');
|
| - IterableMixinWorkaround.fillRangeList(this, start, end, fillValue);
|
| - }
|
| + void fillRange(int start, int end, [E fillValue]);
|
|
|
| /**
|
| * Removes the objects in the range [start] inclusive to [end] exclusive
|
| @@ -724,11 +468,12 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * list.join(', '); // '1, 6, 7, 5'
|
| *
|
| * An error occurs if [start]..[end] is not a valid range for `this`.
|
| + *
|
| + * This method does not work on fixed-length lists, even when [replacement]
|
| + * has the same number of elements as the replaced range. In that case use
|
| + * [setRange] instead.
|
| */
|
| - void replaceRange(int start, int end, Iterable<E> replacement) {
|
| - checkGrowable('removeRange');
|
| - IterableMixinWorkaround.replaceRangeList(this, start, end, replacement);
|
| - }
|
| + void replaceRange(int start, int end, Iterable<E> replacement);
|
|
|
| /**
|
| * Returns an unmodifiable [Map] view of `this`.
|
| @@ -742,7 +487,5 @@ abstract class List<E> implements Iterable<E>, EfficientLength {
|
| * map[0] + map[1]; // 'feefi';
|
| * map.keys.toList(); // [0, 1, 2, 3]
|
| */
|
| - Map<int, E> asMap() {
|
| - return new IterableMixinWorkaround<E>().asMapList(this);
|
| - }
|
| + Map<int, E> asMap();
|
| }
|
|
|