Changeset 9932 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 27, 2005, 4:44:59 PM (20 years ago)

Author:

ggaren

Message:

JavaScriptCore:

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4147 Array.toString() and toLocaleString() improvements from KDE KJS (rolled in KDE changes)

Test cases added:

• layout-tests/fast/js/toString-overrides-expected.txt: Added.
• layout-tests/fast/js/toString-overrides.html: Added.

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

WebCore:

• added test case for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4147 Array.toString() and toLocaleString() improvements from KDE KJS

Test cases added:

• layout-tests/fast/js/toString-overrides-expected.txt: Added.
• layout-tests/fast/js/toString-overrides.html: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/array_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-07-27  Geoffrey Garen  <[email protected]>
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4147
+        Array.toString() and toLocaleString() improvements from KDE KJS
+        (rolled in KDE changes)
+
+        Test cases added:
+
+        * layout-tests/fast/js/toString-overrides-expected.txt: Added.
+        * layout-tests/fast/js/toString-overrides.html: Added.
+        
+        * kjs/array_object.cpp:
+        (ArrayProtoFuncImp::call):
+
 2005-07-27  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -483 +483 @@
         continue;
 
-      Object o = element.toObject(exec);
-      Object conversionFunction;
+      bool fallback = false;
       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);
-      
+        Object o = element.toObject(exec);
+        Object conversionFunction =
+          Object::dynamicCast(o.get(exec, toLocaleStringPropertyName));
+        if (conversionFunction.isValid() &&
+            conversionFunction.implementsCall()) {
+          str += conversionFunction.call(exec, o, List()).toString(exec);
+        } else {
+          // try toString() fallback
+          fallback = true;
+        }
+      }
+
+      if (id == ToString || id == Join || fallback) {
+        if (element.type() == ObjectType) {
+          Object o = Object::dynamicCast(element);
+          Object conversionFunction =
+            Object::dynamicCast(o.get(exec, toStringPropertyName));
+          if (conversionFunction.isValid() &&
+              conversionFunction.implementsCall()) {
+            str += conversionFunction.call(exec, o, List()).toString(exec);
+          } else {
+            UString msg = "Can't convert " + o.className() +
+              " object to string";
+            Object error = Error::create(exec, RangeError,
+                msg.cstring().c_str());
+            exec->setException(error);
+            return error;
+          }
+        } else {
+          str += element.toString(exec);
+        }
+      }
+
       if ( exec->hadException() )
         break;