Changeset 15952 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Aug 21, 2006, 10:43:55 AM (19 years ago)

Author:

ap

Message:

2006-08-21 Vladimir Olexa <​[email protected]>

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=6252
JavaScript 1.6 Array.lastIndexOf

Test: fast/js/array-lastIndexOf.html

• kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Added a LastIndexOf case.
• kjs/array_object.h: (KJS::ArrayProtoFunc::): Added LastIndexOf to enum.
• tests/mozilla/expected.html: Two more tests now pass.

File:

• trunk/JavaScriptCore/kjs/array_object.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -404 +404 @@
   some           ArrayProtoFunc::Some           DontEnum|Function 1
   indexOf        ArrayProtoFunc::IndexOf        DontEnum|Function 1
+  lastIndexOf    ArrayProtoFunc::LastIndexOf    DontEnum|Function 1
   filter         ArrayProtoFunc::Filter         DontEnum|Function 1
   map            ArrayProtoFunc::Map            DontEnum|Function 1
@@ -893 +894 @@
     return jsNumber(-1);
   }
-
+  case LastIndexOf: {
+       // JavaScript 1.6 Extension by Mozilla
+      // Documentation: http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Array:lastIndexOf 
+
+    int index = length - 1;
+    double d = args[1]->toInteger(exec);
+
+    if (d < 0) {
+        d += length;
+        if (d < 0) 
+            return jsNumber(-1);
+    }
+    if (d < length)
+        index = static_cast<int>(d);
+          
+    JSValue* searchElement = args[0];
+    for (; index >= 0; --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);