| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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 // Test foreach (aka. for-in) functionality. | 5 // Test foreach (aka. for-in) functionality. |
| 6 | 6 |
| 7 testIterator(List expect, Iterable input) { | 7 testIterator(List expect, Iterable input) { |
| 8 int i = 0; | 8 int i = 0; |
| 9 for (var value in input) { | 9 for (var value in input) { |
| 10 Expect.isTrue(i < expect.length); | 10 Expect.isTrue(i < expect.length); |
| 11 Expect.equals(expect[i], value); | 11 Expect.equals(expect[i], value); |
| 12 i += 1; | 12 i += 1; |
| 13 } | 13 } |
| 14 Expect.equals(expect.length, i); | 14 Expect.equals(expect.length, i); |
| 15 | 15 |
| 16 i = 0; | 16 i = 0; |
| 17 var value2; | 17 var value2; |
| 18 for (value2 in input) { | 18 for (value2 in input) { |
| 19 Expect.isTrue(i < expect.length); | 19 Expect.isTrue(i < expect.length); |
| 20 Expect.equals(expect[i], value2); | 20 Expect.equals(expect[i], value2); |
| 21 i += 1; | 21 i += 1; |
| 22 } | 22 } |
| 23 Expect.equals(expect.length, i); | 23 Expect.equals(expect.length, i); |
| 24 } | 24 } |
| 25 | 25 |
| 26 class MyIterable<T> implements Iterable<T> { | 26 class MyIterable<T> extends Iterable<T> { |
| 27 final List<T> values; | 27 final List<T> values; |
| 28 MyIterable(List<T> values) : this.values = values; | 28 MyIterable(List<T> values) : this.values = values; |
| 29 Iterator iterator() { | 29 Iterator get iterator { |
| 30 return new MyListIterator(values); | 30 return new MyListIterator(values); |
| 31 } | 31 } |
| 32 } | 32 } |
| 33 | 33 |
| 34 class MyListIterator<T> implements Iterator<T> { | 34 class MyListIterator<T> implements Iterator<T> { |
| 35 final List<T> values; | 35 final List<T> values; |
| 36 int index; | 36 int index; |
| 37 MyListIterator(List<T> values) : this.values = values, index = 0; | 37 MyListIterator(List<T> values) : this.values = values, index = -1; |
| 38 bool get hasNext => index < values.length; | 38 |
| 39 T next() => values[index++]; | 39 bool moveNext() => ++index < values.length; |
| 40 T current() => (0 <= index && index < length) ? values[index] : null; |
| 40 } | 41 } |
| 41 | 42 |
| 42 void main() { | 43 void main() { |
| 43 testIterator([], []); | 44 testIterator([], []); |
| 44 testIterator([], new MyIterable([])); | 45 testIterator([], new MyIterable([])); |
| 45 testIterator([1], [1]); | 46 testIterator([1], [1]); |
| 46 testIterator([1], new MyIterable([1])); | 47 testIterator([1], new MyIterable([1])); |
| 47 testIterator([1,2,3], [1,2,3]); | 48 testIterator([1,2,3], [1,2,3]); |
| 48 testIterator([1,2,3], new MyIterable([1,2,3])); | 49 testIterator([1,2,3], new MyIterable([1,2,3])); |
| 49 testIterator(["a","b","c"], ["a","b","c"]); | 50 testIterator(["a","b","c"], ["a","b","c"]); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 71 | 72 |
| 72 // Using the same variable (showing that the expression is evaluated | 73 // Using the same variable (showing that the expression is evaluated |
| 73 // in the outer scope). | 74 // in the outer scope). |
| 74 int result = 0; | 75 int result = 0; |
| 75 var x = [1,2,3]; | 76 var x = [1,2,3]; |
| 76 for (var x in x) { | 77 for (var x in x) { |
| 77 result += x; | 78 result += x; |
| 78 } | 79 } |
| 79 Expect.equals(6, result); | 80 Expect.equals(6, result); |
| 80 } | 81 } |
| OLD | NEW |