Changeset 11659 in webkit

Timestamp:

Dec 18, 2005 4:27:29 PM (18 years ago)

Author:

darin

Message:

JavaScriptCore:

Reviewed, tweaked, and landed by Darin.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5227 Array indexOf() extension for JavaScript 1.5 Core

• kjs/array_object.h:
• kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Added implementation of indexOf.

LayoutTests:

Reviewed, tweaked, and landed by Darin.

• test for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5227 Array indexOf() extension for JavaScript 1.5 Core

• fast/js/array-indexof-expected.txt: Added.
• fast/js/array-indexof.html: Added.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/kjs/array_object.cpp (modified) (2 diffs)
• JavaScriptCore/kjs/array_object.h (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/array-indexof-expected.txt (added)
• LayoutTests/fast/js/array-indexof.html (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-12-18  Justin Haygood  <justin@xiondigital.net>
+
+        Reviewed, tweaked, and landed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=5227
+          Array indexOf() extension for JavaScript 1.5 Core
+
+        * kjs/array_object.h:
+        * kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Added implementation of indexOf.
+
 2005-12-18  Anders Carlsson  <andersca@mac.com>
 

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -393 +393 @@
   forEach        ArrayProtoFunc::ForEach        DontEnum|Function 5
   some           ArrayProtoFunc::Some           DontEnum|Function 5
+  indexOf        ArrayProtoFunc::IndexOf       DontEnum|Function 1
 @end
 */
@@ -811 +812 @@
     break;
   }
-    
+
+  case IndexOf: {
+    // JavaScript 1.5 Extension by Mozilla
+    // Documentation: http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:indexOf
+
+    unsigned index = 0;
+    double d = args[1]->toInteger(exec);
+    if (d < 0)
+        d += length;
+    if (d > 0) {
+        if (d > length)
+            index = length;
+        else
+            index = static_cast<unsigned>(d);
+    }
+
+    JSValue* searchElement = args[0];
+    for (; index < length; ++index) {
+        JSValue* e = getProperty(exec, thisObj, index);
+        if (!e)
+            e = jsUndefined();
+        if (strictEqual(exec, searchElement, e))
+            return jsNumber(index);
+    }
+
+    return jsNumber(-1);
+  }
+
   default:
     assert(0);

trunk/JavaScriptCore/kjs/array_object.h

@@ -46 +46 @@
     enum { ToString, ToLocaleString, Concat, Join, Pop, Push,
           Reverse, Shift, Slice, Sort, Splice, UnShift, 
-          Every, ForEach, Some };
+          Every, ForEach, Some, IndexOf };
   private:
     int id;

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2005-12-18  Justin Haygood  <justin@xiondigital.net>
+
+        Reviewed, tweaked, and landed by Darin.
+
+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=5227
+          Array indexOf() extension for JavaScript 1.5 Core
+
+        * fast/js/array-indexof-expected.txt: Added.
+        * fast/js/array-indexof.html: Added.
+
 2005-12-18  Mitz Pettel  <opendarwin.org@mitzpettel.com>