Changeset 9842 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jul 19, 2005, 7:23:57 PM (20 years ago)

Author:

ggaren

Message:

-fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=3991
JSC doesn't implement Array.prototype.toLocaleString()

-test failure: ecma_3/Array/15.4.4.3-1.js

Reviewed by mjs.

• kjs/array_object.cpp: (ArrayProtoFuncImp::call): now searches for toString and toLocaleString overrides in the array's elements

• tests/mozilla/expected.html: failures are under 100! woohoo!

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -450 +450 @@
   switch (id) {
   case ToLocaleString:
-    // TODO  - see 15.4.4.3
-    // fall through
   case ToString:
 
@@ -461 +459 @@
 
     // fall through
-
   case Join: {
     UString separator = ",";
@@ -471 +468 @@
       if (k >= 1)
         str += separator;
-      Value element = thisObj.get(exec,k);
-      if (element.type() != UndefinedType && element.type() != NullType)
-        str += element.toString(exec);
+      
+      Value element = thisObj.get(exec, k);
+      if (element.type() == UndefinedType || element.type() == NullType)
+        continue;
+
+      Object o = element.toObject(exec);
+      Object conversionFunction;
+      if (id == ToLocaleString) {
+        conversionFunction = Object::dynamicCast(o.get(exec, toLocaleStringPropertyName));
+      } else {
+        conversionFunction = Object::dynamicCast(o.get(exec, toStringPropertyName));
+      }
+      str += conversionFunction.call(exec, o, List()).toString(exec);
+      
       if ( exec->hadException() )
-        break;
+        break;
     }
     result = String(str);