| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 // The _GrowableArrayMarker class is used to signal to the List() factory | 5 // The _GrowableArrayMarker class is used to signal to the List() factory |
| 6 // whether a parameter was passed. | 6 // whether a parameter was passed. |
| 7 class _GrowableArrayMarker implements int { | 7 class _GrowableArrayMarker implements int { |
| 8 const _GrowableArrayMarker(); | 8 const _GrowableArrayMarker(); |
| 9 } | 9 } |
| 10 | 10 |
| 11 const _GROWABLE_ARRAY_MARKER = const _GrowableArrayMarker(); | 11 const _GROWABLE_ARRAY_MARKER = const _GrowableArrayMarker(); |
| 12 | 12 |
| 13 @patch class List<E> { | 13 @patch class List<E> { |
| 14 /* @patch */ factory List([int length = _GROWABLE_ARRAY_MARKER]) { | 14 @patch factory List([int length = _GROWABLE_ARRAY_MARKER]) { |
| 15 if (identical(length, _GROWABLE_ARRAY_MARKER)) { | 15 if (identical(length, _GROWABLE_ARRAY_MARKER)) { |
| 16 return new _GrowableList<E>(0); | 16 return new _GrowableList<E>(0); |
| 17 } | 17 } |
| 18 // All error handling on the length parameter is done at the implementation | 18 // All error handling on the length parameter is done at the implementation |
| 19 // of new _List. | 19 // of new _List. |
| 20 return new _List<E>(length); | 20 return new _List<E>(length); |
| 21 } | 21 } |
| 22 | 22 |
| 23 /* @patch */ factory List.filled(int length, E fill, {bool growable: false}) { | 23 @patch factory List.filled(int length, E fill, {bool growable: false}) { |
| 24 // All error handling on the length parameter is done at the implementation | 24 // All error handling on the length parameter is done at the implementation |
| 25 // of new _List. | 25 // of new _List. |
| 26 var result = growable ? new _GrowableList<E>(length) : new _List<E>(length); | 26 var result = growable ? new _GrowableList<E>(length) : new _List<E>(length); |
| 27 if (fill != null) { | 27 if (fill != null) { |
| 28 for (int i = 0; i < length; i++) { | 28 for (int i = 0; i < length; i++) { |
| 29 result[i] = fill; | 29 result[i] = fill; |
| 30 } | 30 } |
| 31 } | 31 } |
| 32 return result; | 32 return result; |
| 33 } | 33 } |
| 34 | 34 |
| 35 /* @patch */ factory List.from(Iterable elements, { bool growable: true }) { | 35 @patch factory List.from(Iterable elements, { bool growable: true }) { |
| 36 if (elements is EfficientLength) { | 36 if (elements is EfficientLength) { |
| 37 int length = elements.length; | 37 int length = elements.length; |
| 38 var list = growable ? new _GrowableList<E>(length) : new _List<E>(length); | 38 var list = growable ? new _GrowableList<E>(length) : new _List<E>(length); |
| 39 if (length > 0) { // Avoid creating iterator unless necessary. | 39 if (length > 0) { // Avoid creating iterator unless necessary. |
| 40 int i = 0; | 40 int i = 0; |
| 41 for (var element in elements) { list[i++] = element; } | 41 for (var element in elements) { list[i++] = element; } |
| 42 } | 42 } |
| 43 return list; | 43 return list; |
| 44 } | 44 } |
| 45 List<E> list = new _GrowableList<E>(0); | 45 List<E> list = new _GrowableList<E>(0); |
| 46 for (E e in elements) { | 46 for (E e in elements) { |
| 47 list.add(e); | 47 list.add(e); |
| 48 } | 48 } |
| 49 if (growable) return list; | 49 if (growable) return list; |
| 50 if (list.length == 0) { | 50 if (list.length == 0) { |
| 51 // Avoid getting an immutable list from makeListFixedLength. | 51 // Avoid getting an immutable list from makeListFixedLength. |
| 52 return new _List<E>(0); | 52 return new _List<E>(0); |
| 53 } | 53 } |
| 54 return makeListFixedLength(list); | 54 return makeListFixedLength(list); |
| 55 } | 55 } |
| 56 | 56 |
| 57 /* @patch */ factory List.unmodifiable(Iterable elements) { | 57 @patch factory List.unmodifiable(Iterable elements) { |
| 58 List result = new List<E>.from(elements, growable: false); | 58 List result = new List<E>.from(elements, growable: false); |
| 59 return makeFixedListUnmodifiable(result); | 59 return makeFixedListUnmodifiable(result); |
| 60 } | 60 } |
| 61 | 61 |
| 62 // Factory constructing a mutable List from a parser generated List literal. | 62 // Factory constructing a mutable List from a parser generated List literal. |
| 63 // [elements] contains elements that are already type checked. | 63 // [elements] contains elements that are already type checked. |
| 64 factory List._fromLiteral(List elements) { | 64 factory List._fromLiteral(List elements) { |
| 65 if (elements.isEmpty) { | 65 if (elements.isEmpty) { |
| 66 return new _GrowableList<E>(0); | 66 return new _GrowableList<E>(0); |
| 67 } | 67 } |
| 68 var result = new _GrowableList<E>.withData(elements); | 68 var result = new _GrowableList<E>.withData(elements); |
| 69 result._setLength(elements.length); | 69 result._setLength(elements.length); |
| 70 return result; | 70 return result; |
| 71 } | 71 } |
| 72 } | 72 } |
| OLD | NEW |