Chromium Code Reviews| Index: src/array-iterator.js |
| diff --git a/src/array-iterator.js b/src/array-iterator.js |
| index 9698a07b0442eb5e83b330fd73206963fa5619d1..98f5331ce0e0e53fcafc88f82bd0cf06cceb54d3 100644 |
| --- a/src/array-iterator.js |
| +++ b/src/array-iterator.js |
| @@ -10,6 +10,15 @@ var $arrayValues; |
| %CheckIsBootstrapping(); |
| +// ----------------------------------------------------------------------- |
| +// Imports |
| + |
| +var ArrayIterationKindSymbol = |
|
rossberg
2015/08/20 12:50:12
I don't feel too strongly, but don't we typically
|
| + utils.GetPrivateSymbol("array_iteration_kind_symbol"); |
| +var ArrayIteratorNextIndexSymbol = |
| + utils.GetPrivateSymbol("array_iterator_next_symbol"); |
| +var ArrayIteratorObjectSymbol = |
| + utils.GetPrivateSymbol("array_iterator_object_symbol"); |
| var GlobalArray = global.Array; |
| macro TYPED_ARRAYS(FUNCTION) |
| @@ -30,10 +39,7 @@ endmacro |
| TYPED_ARRAYS(COPY_FROM_GLOBAL) |
| -var arrayIteratorObjectSymbol = GLOBAL_PRIVATE("ArrayIterator#object"); |
| -var arrayIteratorNextIndexSymbol = GLOBAL_PRIVATE("ArrayIterator#next"); |
| -var arrayIterationKindSymbol = GLOBAL_PRIVATE("ArrayIterator#kind"); |
| - |
| +// ----------------------------------------------------------------------- |
| function ArrayIterator() {} |
| @@ -47,9 +53,9 @@ function ArrayIterator() {} |
| function CreateArrayIterator(array, kind) { |
| var object = TO_OBJECT(array); |
| var iterator = new ArrayIterator; |
| - SET_PRIVATE(iterator, arrayIteratorObjectSymbol, object); |
| - SET_PRIVATE(iterator, arrayIteratorNextIndexSymbol, 0); |
| - SET_PRIVATE(iterator, arrayIterationKindSymbol, kind); |
| + SET_PRIVATE(iterator, ArrayIteratorObjectSymbol, object); |
| + SET_PRIVATE(iterator, ArrayIteratorNextIndexSymbol, 0); |
| + SET_PRIVATE(iterator, ArrayIterationKindSymbol, kind); |
| return iterator; |
| } |
| @@ -70,28 +76,28 @@ function ArrayIteratorIterator() { |
| function ArrayIteratorNext() { |
| var iterator = TO_OBJECT(this); |
| - if (!HAS_DEFINED_PRIVATE(iterator, arrayIteratorNextIndexSymbol)) { |
| + if (!HAS_DEFINED_PRIVATE(iterator, ArrayIteratorNextIndexSymbol)) { |
| throw MakeTypeError(kIncompatibleMethodReceiver, |
| 'Array Iterator.prototype.next', this); |
| } |
| - var array = GET_PRIVATE(iterator, arrayIteratorObjectSymbol); |
| + var array = GET_PRIVATE(iterator, ArrayIteratorObjectSymbol); |
| if (IS_UNDEFINED(array)) { |
| return CreateIteratorResultObject(UNDEFINED, true); |
| } |
| - var index = GET_PRIVATE(iterator, arrayIteratorNextIndexSymbol); |
| - var itemKind = GET_PRIVATE(iterator, arrayIterationKindSymbol); |
| + var index = GET_PRIVATE(iterator, ArrayIteratorNextIndexSymbol); |
| + var itemKind = GET_PRIVATE(iterator, ArrayIterationKindSymbol); |
| var length = TO_UINT32(array.length); |
| // "sparse" is never used. |
| if (index >= length) { |
| - SET_PRIVATE(iterator, arrayIteratorObjectSymbol, UNDEFINED); |
| + SET_PRIVATE(iterator, ArrayIteratorObjectSymbol, UNDEFINED); |
| return CreateIteratorResultObject(UNDEFINED, true); |
| } |
| - SET_PRIVATE(iterator, arrayIteratorNextIndexSymbol, index + 1); |
| + SET_PRIVATE(iterator, ArrayIteratorNextIndexSymbol, index + 1); |
| if (itemKind == ITERATOR_KIND_VALUES) { |
| return CreateIteratorResultObject(array[index], false); |