Use iterator, moveNext(), current.

runtime/lib/byte_array.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 patch class Int8List {
   /* patch */ factory Int8List(int length) {
     return new _Int8Array(length);
   }
 
   /* patch */ factory Int8List.view(ByteArray array,
@@ skipping 340 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   double operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, double value) {
     _setIndexed(index, value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 42 matching lines @@
   }
 
   double operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, double value) {
     _setIndexed(index, value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = _new(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalInt8Array extends _ByteArrayBase implements Int8List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int8List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 29 matching lines @@
 
 class _ExternalUint8Array extends _ByteArrayBase implements Uint8List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint8List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 29 matching lines @@
 
 class _ExternalInt16Array extends _ByteArrayBase implements Int16List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int16List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 29 matching lines @@
 
 class _ExternalUint16Array extends _ByteArrayBase implements Uint16List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint16List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalInt32Array extends _ByteArrayBase implements Int32List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalUint32Array extends _ByteArrayBase implements Uint32List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalInt64Array extends _ByteArrayBase implements Int64List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toInt64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalUint64Array extends _ByteArrayBase implements Uint64List {
   int operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, int value) {
     _setIndexed(index, _toUint64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalFloat32Array extends _ByteArrayBase implements Float32List {
   double operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, double value) {
     _setIndexed(index, value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = new Float32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 31 matching lines @@
 
 class _ExternalFloat64Array extends _ByteArrayBase implements Float64List {
   double operator[](int index) {
     return _getIndexed(index);
   }
 
   int operator[]=(int index, double value) {
     _setIndexed(index, value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = new Float64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 24 matching lines @@
 
   double _getIndexed(int index)
       native "ExternalFloat64Array_getIndexed";
   int _setIndexed(int index, double value)
       native "ExternalFloat64Array_setIndexed";
 }
 
 
 class _ByteArrayIterator<E> implements Iterator<E> {
   _ByteArrayIterator(List array)
-    : _array = array, _length = array.length, _pos = 0 {
+    : _array = array, _length = array.length, _pos = -1 {
     assert(array is _ByteArrayBase || array is _ByteArrayViewBase);
   }
 
-  bool get hasNext {
-   return _length > _pos;
+  bool moveNext() {
+    _pos++;
+    if (_pos < _length) return true;
+    _pos = _length;
+    return false;
   }
 
-  E next() {
-    if (!hasNext) {
-      throw new StateError("No more elements");
+  E get current {
+    if (0 <= _pos && _pos < _length) {
+      return _array[_pos];
     }
-    return _array[_pos++];
+    // TODO(floitsch): adapt error message.
+    throw new StateError("No more elements");
   }
 
   final List<E> _array;
   final int _length;
   int _pos;
 }
 
 
 class _ByteArrayView implements ByteArray {
   _ByteArrayView(this._array, this._offset, this._length) {
@@ skipping 213 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setInt8(_offset + (index * _BYTES_PER_ELEMENT), _toInt8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int8List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setUint8(_offset + (index * _BYTES_PER_ELEMENT), _toUint8(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint8List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setInt16(_offset + (index * _BYTES_PER_ELEMENT), _toInt16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int16List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setUint16(_offset + (index * _BYTES_PER_ELEMENT), _toUint16(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint16List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setInt32(_offset + (index * _BYTES_PER_ELEMENT), _toInt32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setUint32(_offset + (index * _BYTES_PER_ELEMENT), _toUint32(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setInt64(_offset + (index * _BYTES_PER_ELEMENT), _toInt64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Int64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, int value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setUint64(_offset + (index * _BYTES_PER_ELEMENT), _toUint64(value));
   }
 
-  Iterator<int> iterator() {
+  Iterator<int> get iterator {
     return new _ByteArrayIterator<int>(this);
   }
 
   List<int> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<int> result = new Uint64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, double value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setFloat32(_offset + (index * _BYTES_PER_ELEMENT), value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = new Float32List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 51 matching lines @@
   }
 
   void operator[]=(int index, double value) {
     if (index < 0 || index >= _length) {
       String message = "$index must be in the range [0..$_length)";
       throw new RangeError(message);
     }
     _array.setFloat64(_offset + (index * _BYTES_PER_ELEMENT), value);
   }
 
-  Iterator<double> iterator() {
+  Iterator<double> get iterator {
     return new _ByteArrayIterator<double>(this);
   }
 
   List<double> getRange(int start, int length) {
     _rangeCheck(this.length, start, length);
     List<double> result = new Float64List(length);
     result.setRange(0, length, this, start);
     return result;
   }
 
@@ skipping 19 matching lines @@
     }
     _rangeCheck(this.length, start, length);
     return _array.subByteArray(_offset + start, length);
   }
 
   static const int _BYTES_PER_ELEMENT = 8;
   final ByteArray _array;
   final int _offset;
   final int _length;
 }