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

Timestamp:

Jun 29, 2005, 6:19:47 PM (20 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Patch by Francisco Tolmasky <​[email protected]>

• fixes ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3667 Core JavaScript 1.5 Reference:Objects:Array:forEach

See WebCore Changelog for layout tests added.

Reviewed by darin.

• kjs/array_object.cpp: (ArrayProtoFuncImp::call):
• kjs/array_object.h: (KJS::ArrayProtoFuncImp::):

WebCore:

Contributed by Francisco Tolmasky <​[email protected]>

-test cases for fix to ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3667
Core JavaScript 1.5 Reference:Objects:Array:forEach

See JavaScriptCore Changelog for details on the patch.

Reviewed by darin.

Test cases added:

• layout-tests/fast/js/array-every-expected.txt: Added.
• layout-tests/fast/js/array-every.html: Added.
• layout-tests/fast/js/array-foreach-expected.txt: Added.
• layout-tests/fast/js/array-foreach.html: Added.
• layout-tests/fast/js/array-some-expected.txt: Added.
• layout-tests/fast/js/array-some.html: Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -391 +391 @@
 
 /* Source for array_object.lut.h
-@begin arrayTable 13
+@begin arrayTable 16
   toString       ArrayProtoFuncImp::ToString       DontEnum|Function 0
   toLocaleString ArrayProtoFuncImp::ToLocaleString DontEnum|Function 0
@@ -404 +404 @@
   splice         ArrayProtoFuncImp::Splice         DontEnum|Function 2
   unshift        ArrayProtoFuncImp::UnShift        DontEnum|Function 1
+  every          ArrayProtoFuncImp::Every          DontEnum|Function 5
+  forEach        ArrayProtoFuncImp::ForEach        DontEnum|Function 5
+  some           ArrayProtoFuncImp::Some           DontEnum|Function 5
 @end
 */
@@ -444 +447 @@
 
   Value result;
+  
   switch (id) {
   case ToLocaleString:
@@ -768 +772 @@
     break;
   }
+  case Every:
+  case ForEach:
+  case Some: {
+    //Documentation for these three is available at:
+    //http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:every
+    //http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:forEach
+    //http://developer-test.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Objects:Array:some
+    
+    Object eachFunction = args[0].toObject(exec);
+    
+    if (!eachFunction.implementsCall()) {
+      Object err = Error::create(exec,TypeError);
+      exec->setException(err);
+      return err;
+    }
+    
+    Object applyThis = args[1].imp()->isUndefinedOrNull() ? exec->dynamicInterpreter()->globalObject() :  args[1].toObject(exec);
+    
+    if (id == Some || id == Every)
+      result = Boolean(id == Every);
+    else
+      result = thisObj;
+    
+    for (unsigned k = 0; k < length && !exec->hadException(); ++k) {
+      
+      List eachArguments;
+      
+      eachArguments.append(thisObj.get(exec, k));
+      eachArguments.append(Number(k));
+      eachArguments.append(thisObj);
+      
+      bool predicateResult = eachFunction.call(exec, applyThis, eachArguments).toBoolean(exec);
+      
+      if (id == Every && !predicateResult) {
+        result = Boolean(false);
+        break;
+      }
+      if (id == Some && predicateResult) {
+        result = Boolean(true);
+        break;
+      }
+    }
+    break;
+  }
+    
   default:
     assert(0);