Changeset 167797 in webkit

Timestamp:

Apr 25, 2014 1:25:59 AM (10 years ago)

Author:

graouts@webkit.org

Message:

Implement Array.prototype.find()
​https://bugs.webkit.org/show_bug.cgi?id=130966

Reviewed by Oliver Hunt.

Source/JavaScriptCore:
Implement Array.prototype.find() and Array.prototype.findIndex() as proposed in the Harmony spec.

• builtins/Array.prototype.js:

(find):
(findIndex):

• runtime/ArrayPrototype.cpp:

LayoutTests:

• js/Object-getOwnPropertyNames-expected.txt:
• js/array-find-expected.txt: Added.
• js/array-find.html: Added.
• js/array-findIndex-expected.txt: Added.
• js/array-findIndex.html: Added.
• js/script-tests/Object-getOwnPropertyNames.js:
• js/script-tests/array-find.js: Added.
• js/script-tests/array-findIndex.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/Object-getOwnPropertyNames-expected.txt (modified) (1 diff)
• LayoutTests/js/array-find-expected.txt (added)
• LayoutTests/js/array-find.html (added)
• LayoutTests/js/array-findIndex-expected.txt (added)
• LayoutTests/js/array-findIndex.html (added)
• LayoutTests/js/script-tests/Object-getOwnPropertyNames.js (modified) (1 diff)
• LayoutTests/js/script-tests/array-find.js (added)
• LayoutTests/js/script-tests/array-findIndex.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/Array.prototype.js (modified) (1 diff)
• Source/JavaScriptCore/runtime/ArrayPrototype.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-25  Antoine Quint  <graouts@webkit.org>
+
+        Implement Array.prototype.find()
+        https://bugs.webkit.org/show_bug.cgi?id=130966
+
+        Reviewed by Oliver Hunt.
+
+        * js/Object-getOwnPropertyNames-expected.txt:
+        * js/array-find-expected.txt: Added.
+        * js/array-find.html: Added.
+        * js/array-findIndex-expected.txt: Added.
+        * js/array-findIndex.html: Added.
+        * js/script-tests/Object-getOwnPropertyNames.js:
+        * js/script-tests/array-find.js: Added.
+        * js/script-tests/array-findIndex.js: Added.
+
 2014-04-25  Ion Rosca  <rosca@adobe.com>
 

trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt

@@ -46 +46 @@
 PASS getSortedOwnPropertyNames(Function.prototype) is ['apply', 'bind', 'call', 'constructor', 'length', 'name', 'toString']
 PASS getSortedOwnPropertyNames(Array) is ['isArray', 'length', 'name', 'prototype']
-PASS getSortedOwnPropertyNames(Array.prototype) is ['concat', 'constructor', 'entries', 'every', 'fill', 'filter', 'forEach', 'indexOf', 'join', 'keys', 'lastIndexOf', 'length', 'map', 'pop', 'push', 'reduce', 'reduceRight', 'reverse', 'shift', 'slice', 'some', 'sort', 'splice', 'toLocaleString', 'toString', 'unshift']
+PASS getSortedOwnPropertyNames(Array.prototype) is ['concat', 'constructor', 'entries', 'every', 'fill', 'filter', 'find', 'findIndex', 'forEach', 'indexOf', 'join', 'keys', 'lastIndexOf', 'length', 'map', 'pop', 'push', 'reduce', 'reduceRight', 'reverse', 'shift', 'slice', 'some', 'sort', 'splice', 'toLocaleString', 'toString', 'unshift']
 PASS getSortedOwnPropertyNames(String) is ['fromCharCode', 'length', 'name', 'prototype']
 PASS getSortedOwnPropertyNames(String.prototype) is ['anchor', 'big', 'blink', 'bold', 'charAt', 'charCodeAt', 'concat', 'constructor', 'fixed', 'fontcolor', 'fontsize', 'indexOf', 'italics', 'lastIndexOf', 'length', 'link', 'localeCompare', 'match', 'replace', 'search', 'slice', 'small', 'split', 'strike', 'sub', 'substr', 'substring', 'sup', 'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toString', 'toUpperCase', 'trim', 'trimLeft', 'trimRight', 'valueOf']

trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js

@@ -54 +54 @@
     "Function.prototype": "['apply', 'bind', 'call', 'constructor', 'length', 'name', 'toString']",
     "Array": "['isArray', 'length', 'name', 'prototype']",
-    "Array.prototype": "['concat', 'constructor', 'entries', 'every', 'fill', 'filter', 'forEach', 'indexOf', 'join', 'keys', 'lastIndexOf', 'length', 'map', 'pop', 'push', 'reduce', 'reduceRight', 'reverse', 'shift', 'slice', 'some', 'sort', 'splice', 'toLocaleString', 'toString', 'unshift']",
+    "Array.prototype": "['concat', 'constructor', 'entries', 'every', 'fill', 'filter', 'find', 'findIndex', 'forEach', 'indexOf', 'join', 'keys', 'lastIndexOf', 'length', 'map', 'pop', 'push', 'reduce', 'reduceRight', 'reverse', 'shift', 'slice', 'some', 'sort', 'splice', 'toLocaleString', 'toString', 'unshift']",
     "String": "['fromCharCode', 'length', 'name', 'prototype']",
     "String.prototype": "['anchor', 'big', 'blink', 'bold', 'charAt', 'charCodeAt', 'concat', 'constructor', 'fixed', 'fontcolor', 'fontsize', 'indexOf', 'italics', 'lastIndexOf', 'length', 'link', 'localeCompare', 'match', 'replace', 'search', 'slice', 'small', 'split', 'strike', 'sub', 'substr', 'substring', 'sup', 'toLocaleLowerCase', 'toLocaleUpperCase', 'toLowerCase', 'toString', 'toUpperCase', 'trim', 'trimLeft', 'trimRight', 'valueOf']",

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-25  Antoine Quint  <graouts@webkit.org>
+
+        Implement Array.prototype.find()
+        https://bugs.webkit.org/show_bug.cgi?id=130966
+
+        Reviewed by Oliver Hunt.
+
+        Implement Array.prototype.find() and Array.prototype.findIndex() as proposed in the Harmony spec.
+
+        * builtins/Array.prototype.js:
+        (find):
+        (findIndex):
+        * runtime/ArrayPrototype.cpp:
+
 2014-04-24  Brady Eidson  <beidson@apple.com>
 

trunk/Source/JavaScriptCore/builtins/Array.prototype.js

@@ -190 +190 @@
 }
 
+function find(callback /*, thisArg */) {
+    "use strict";
+    if (this === null)
+        throw new @TypeError("Array.prototype.find requires that |this| not be null");
+    
+    if (this === undefined)
+        throw new @TypeError("Array.prototype.find requires that |this| not be undefined");
+    
+    var array = @Object(this);
+    var length = array.length >>> 0;
+    
+    if (typeof callback !== "function")
+        throw new @TypeError("Array.prototype.find callback must be a function");
+    
+    var thisArg = arguments.length > 1 ? arguments[1] : undefined;
+    for (var i = 0; i < length; i++) {
+        if (callback.@call(thisArg, array[i], i, array))
+            return array[i];
+    }
+    return undefined;
+}
+
+function findIndex(callback /*, thisArg */) {
+    "use strict";
+    if (this === null)
+        throw new @TypeError("Array.prototype.findIndex requires that |this| not be null");
+    
+    if (this === undefined)
+        throw new @TypeError("Array.prototype.findIndex requires that |this| not be undefined");
+    
+    var array = @Object(this);
+    var length = array.length >>> 0;
+    
+    if (typeof callback !== "function")
+        throw new @TypeError("Array.prototype.findIndex callback must be a function");
+    
+    var thisArg = arguments.length > 1 ? arguments[1] : undefined;
+    for (var i = 0; i < length; i++) {
+        if (callback.@call(thisArg, array[i], i, array))
+            return i;
+    }
+    return -1;
+}

trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp

@@ -116 +116 @@
   entries        arrayProtoFuncEntries        DontEnum|Function 0
   keys           arrayProtoFuncKeys           DontEnum|Function 0
+  find           arrayProtoFuncFind           DontEnum|Function 1
+  findIndex      arrayProtoFuncFindIndex      DontEnum|Function 1
 @end
 */