Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: test/mjsunit/harmony/array-iterator.js

Issue 258793005: Array Iterator prototype should not have a constructor. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Replace prototype instead of deleting the constructor Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/array-iterator.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 the V8 project authors. All rights reserved. 1 // Copyright 2013 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
11 // with the distribution. 11 // with the distribution.
12 // * Neither the name of Google Inc. nor the names of its 12 // * Neither the name of Google Inc. nor the names of its
13 // contributors may be used to endorse or promote products derived 13 // contributors may be used to endorse or promote products derived
14 // from this software without specific prior written permission. 14 // from this software without specific prior written permission.
15 // 15 //
16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 27
28 // Flags: --harmony-iteration --allow-natives-syntax 28 // Flags: --harmony-iteration --allow-natives-syntax
29 29
30
30 function TestArrayPrototype() { 31 function TestArrayPrototype() {
31 assertTrue(Array.prototype.hasOwnProperty('entries')); 32 assertTrue(Array.prototype.hasOwnProperty('entries'));
32 assertTrue(Array.prototype.hasOwnProperty('values')); 33 assertTrue(Array.prototype.hasOwnProperty('values'));
33 assertTrue(Array.prototype.hasOwnProperty('keys')); 34 assertTrue(Array.prototype.hasOwnProperty('keys'));
34 35
35 assertFalse(Array.prototype.propertyIsEnumerable('entries')); 36 assertFalse(Array.prototype.propertyIsEnumerable('entries'));
36 assertFalse(Array.prototype.propertyIsEnumerable('values')); 37 assertFalse(Array.prototype.propertyIsEnumerable('values'));
37 assertFalse(Array.prototype.propertyIsEnumerable('keys')); 38 assertFalse(Array.prototype.propertyIsEnumerable('keys'));
38 } 39 }
39 TestArrayPrototype(); 40 TestArrayPrototype();
40 41
42
41 function assertIteratorResult(value, done, result) { 43 function assertIteratorResult(value, done, result) {
42 assertEquals({value: value, done: done}, result); 44 assertEquals({value: value, done: done}, result);
43 } 45 }
44 46
47
45 function TestValues() { 48 function TestValues() {
46 var array = ['a', 'b', 'c']; 49 var array = ['a', 'b', 'c'];
47 var iterator = array.values(); 50 var iterator = array.values();
48 assertIteratorResult('a', false, iterator.next()); 51 assertIteratorResult('a', false, iterator.next());
49 assertIteratorResult('b', false, iterator.next()); 52 assertIteratorResult('b', false, iterator.next());
50 assertIteratorResult('c', false, iterator.next()); 53 assertIteratorResult('c', false, iterator.next());
51 assertIteratorResult(void 0, true, iterator.next()); 54 assertIteratorResult(void 0, true, iterator.next());
52 55
53 array.push('d'); 56 array.push('d');
54 assertIteratorResult(void 0, true, iterator.next()); 57 assertIteratorResult(void 0, true, iterator.next());
55 } 58 }
56 TestValues(); 59 TestValues();
57 60
61
58 function TestValuesMutate() { 62 function TestValuesMutate() {
59 var array = ['a', 'b', 'c']; 63 var array = ['a', 'b', 'c'];
60 var iterator = array.values(); 64 var iterator = array.values();
61 assertIteratorResult('a', false, iterator.next()); 65 assertIteratorResult('a', false, iterator.next());
62 assertIteratorResult('b', false, iterator.next()); 66 assertIteratorResult('b', false, iterator.next());
63 assertIteratorResult('c', false, iterator.next()); 67 assertIteratorResult('c', false, iterator.next());
64 array.push('d'); 68 array.push('d');
65 assertIteratorResult('d', false, iterator.next()); 69 assertIteratorResult('d', false, iterator.next());
66 assertIteratorResult(void 0, true, iterator.next()); 70 assertIteratorResult(void 0, true, iterator.next());
67 } 71 }
68 TestValuesMutate(); 72 TestValuesMutate();
69 73
74
70 function TestKeys() { 75 function TestKeys() {
71 var array = ['a', 'b', 'c']; 76 var array = ['a', 'b', 'c'];
72 var iterator = array.keys(); 77 var iterator = array.keys();
73 assertIteratorResult(0, false, iterator.next()); 78 assertIteratorResult(0, false, iterator.next());
74 assertIteratorResult(1, false, iterator.next()); 79 assertIteratorResult(1, false, iterator.next());
75 assertIteratorResult(2, false, iterator.next()); 80 assertIteratorResult(2, false, iterator.next());
76 assertIteratorResult(void 0, true, iterator.next()); 81 assertIteratorResult(void 0, true, iterator.next());
77 82
78 array.push('d'); 83 array.push('d');
79 assertIteratorResult(void 0, true, iterator.next()); 84 assertIteratorResult(void 0, true, iterator.next());
80 } 85 }
81 TestKeys(); 86 TestKeys();
82 87
88
83 function TestKeysMutate() { 89 function TestKeysMutate() {
84 var array = ['a', 'b', 'c']; 90 var array = ['a', 'b', 'c'];
85 var iterator = array.keys(); 91 var iterator = array.keys();
86 assertIteratorResult(0, false, iterator.next()); 92 assertIteratorResult(0, false, iterator.next());
87 assertIteratorResult(1, false, iterator.next()); 93 assertIteratorResult(1, false, iterator.next());
88 assertIteratorResult(2, false, iterator.next()); 94 assertIteratorResult(2, false, iterator.next());
89 array.push('d'); 95 array.push('d');
90 assertIteratorResult(3, false, iterator.next()); 96 assertIteratorResult(3, false, iterator.next());
91 assertIteratorResult(void 0, true, iterator.next()); 97 assertIteratorResult(void 0, true, iterator.next());
92 } 98 }
93 TestKeysMutate(); 99 TestKeysMutate();
94 100
101
95 function TestEntries() { 102 function TestEntries() {
96 var array = ['a', 'b', 'c']; 103 var array = ['a', 'b', 'c'];
97 var iterator = array.entries(); 104 var iterator = array.entries();
98 assertIteratorResult([0, 'a'], false, iterator.next()); 105 assertIteratorResult([0, 'a'], false, iterator.next());
99 assertIteratorResult([1, 'b'], false, iterator.next()); 106 assertIteratorResult([1, 'b'], false, iterator.next());
100 assertIteratorResult([2, 'c'], false, iterator.next()); 107 assertIteratorResult([2, 'c'], false, iterator.next());
101 assertIteratorResult(void 0, true, iterator.next()); 108 assertIteratorResult(void 0, true, iterator.next());
102 109
103 array.push('d'); 110 array.push('d');
104 assertIteratorResult(void 0, true, iterator.next()); 111 assertIteratorResult(void 0, true, iterator.next());
105 } 112 }
106 TestEntries(); 113 TestEntries();
107 114
115
108 function TestEntriesMutate() { 116 function TestEntriesMutate() {
109 var array = ['a', 'b', 'c']; 117 var array = ['a', 'b', 'c'];
110 var iterator = array.entries(); 118 var iterator = array.entries();
111 assertIteratorResult([0, 'a'], false, iterator.next()); 119 assertIteratorResult([0, 'a'], false, iterator.next());
112 assertIteratorResult([1, 'b'], false, iterator.next()); 120 assertIteratorResult([1, 'b'], false, iterator.next());
113 assertIteratorResult([2, 'c'], false, iterator.next()); 121 assertIteratorResult([2, 'c'], false, iterator.next());
114 array.push('d'); 122 array.push('d');
115 assertIteratorResult([3, 'd'], false, iterator.next()); 123 assertIteratorResult([3, 'd'], false, iterator.next());
116 assertIteratorResult(void 0, true, iterator.next()); 124 assertIteratorResult(void 0, true, iterator.next());
117 } 125 }
118 TestEntriesMutate(); 126 TestEntriesMutate();
119 127
128
129 function TestArrayIteratorPrototype() {
130 var ArrayIteratorPrototype = [].values().__proto__;
131 assertFalse(ArrayIteratorPrototype.hasOwnProperty('constructor'));
132 assertEquals(ArrayIteratorPrototype.__proto__, Object.prototype);
133 assertArrayEquals(['next'],
134 Object.getOwnPropertyNames(ArrayIteratorPrototype));
135 }
136 TestArrayIteratorPrototype();
137
138
120 function TestArrayIteratorPrototype() { 139 function TestArrayIteratorPrototype() {
121 var array = []; 140 var array = [];
122 var iterator = array.values(); 141 var iterator = array.values();
123 142
124 var ArrayIterator = iterator.constructor; 143 var ArrayIteratorPrototype = iterator.__proto__;
125 assertEquals(ArrayIterator.prototype, array.values().__proto__);
126 assertEquals(ArrayIterator.prototype, array.keys().__proto__);
127 assertEquals(ArrayIterator.prototype, array.entries().__proto__);
128 144
129 assertEquals(Object.prototype, ArrayIterator.prototype.__proto__); 145 assertEquals(ArrayIteratorPrototype, array.values().__proto__);
146 assertEquals(ArrayIteratorPrototype, array.keys().__proto__);
147 assertEquals(ArrayIteratorPrototype, array.entries().__proto__);
148
149 assertEquals(Object.prototype, ArrayIteratorPrototype.__proto__);
130 150
131 assertEquals('Array Iterator', %_ClassOf(array.values())); 151 assertEquals('Array Iterator', %_ClassOf(array.values()));
132 assertEquals('Array Iterator', %_ClassOf(array.keys())); 152 assertEquals('Array Iterator', %_ClassOf(array.keys()));
133 assertEquals('Array Iterator', %_ClassOf(array.entries())); 153 assertEquals('Array Iterator', %_ClassOf(array.entries()));
134 154
135 var prototypeDescriptor = 155 assertFalse(ArrayIteratorPrototype.hasOwnProperty('constructor'));
136 Object.getOwnPropertyDescriptor(ArrayIterator, 'prototype'); 156 assertArrayEquals(['next'],
137 assertFalse(prototypeDescriptor.configurable); 157 Object.getOwnPropertyNames(ArrayIteratorPrototype));
138 assertFalse(prototypeDescriptor.enumerable);
139 assertFalse(prototypeDescriptor.writable);
140 } 158 }
141 TestArrayIteratorPrototype(); 159 TestArrayIteratorPrototype();
142 160
161
143 function TestForArrayValues() { 162 function TestForArrayValues() {
144 var buffer = []; 163 var buffer = [];
145 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN]; 164 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN];
146 var i = 0; 165 var i = 0;
147 for (var value of array.values()) { 166 for (var value of array.values()) {
148 buffer[i++] = value; 167 buffer[i++] = value;
149 } 168 }
150 169
151 assertEquals(8, buffer.length); 170 assertEquals(8, buffer.length);
152 171
153 for (var i = 0; i < buffer.length - 1; i++) { 172 for (var i = 0; i < buffer.length - 1; i++) {
154 assertEquals(array[i], buffer[i]); 173 assertEquals(array[i], buffer[i]);
155 } 174 }
156 assertTrue(isNaN(buffer[buffer.length - 1])); 175 assertTrue(isNaN(buffer[buffer.length - 1]));
157 } 176 }
158 TestForArrayValues(); 177 TestForArrayValues();
159 178
179
160 function TestForArrayKeys() { 180 function TestForArrayKeys() {
161 var buffer = []; 181 var buffer = [];
162 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN]; 182 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN];
163 var i = 0; 183 var i = 0;
164 for (var key of array.keys()) { 184 for (var key of array.keys()) {
165 buffer[i++] = key; 185 buffer[i++] = key;
166 } 186 }
167 187
168 assertEquals(8, buffer.length); 188 assertEquals(8, buffer.length);
169 189
170 for (var i = 0; i < buffer.length; i++) { 190 for (var i = 0; i < buffer.length; i++) {
171 assertEquals(i, buffer[i]); 191 assertEquals(i, buffer[i]);
172 } 192 }
173 } 193 }
174 TestForArrayKeys(); 194 TestForArrayKeys();
175 195
196
176 function TestForArrayEntries() { 197 function TestForArrayEntries() {
177 var buffer = []; 198 var buffer = [];
178 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN]; 199 var array = [0, 'a', true, false, null, /* hole */, undefined, NaN];
179 var i = 0; 200 var i = 0;
180 for (var entry of array.entries()) { 201 for (var entry of array.entries()) {
181 buffer[i++] = entry; 202 buffer[i++] = entry;
182 } 203 }
183 204
184 assertEquals(8, buffer.length); 205 assertEquals(8, buffer.length);
185 206
186 for (var i = 0; i < buffer.length - 1; i++) { 207 for (var i = 0; i < buffer.length - 1; i++) {
187 assertEquals(array[i], buffer[i][1]); 208 assertEquals(array[i], buffer[i][1]);
188 } 209 }
189 assertTrue(isNaN(buffer[buffer.length - 1][1])); 210 assertTrue(isNaN(buffer[buffer.length - 1][1]));
190 211
191 for (var i = 0; i < buffer.length; i++) { 212 for (var i = 0; i < buffer.length; i++) {
192 assertEquals(i, buffer[i][0]); 213 assertEquals(i, buffer[i][0]);
193 } 214 }
194 } 215 }
195 TestForArrayEntries(); 216 TestForArrayEntries();
OLDNEW
« no previous file with comments | « src/array-iterator.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698