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

Timestamp:

Nov 6, 2006, 12:30:01 AM (19 years ago)

Author:

bdash

Message:

2006-11-06 Mark Rowe <​[email protected]>

Reviewed by the wonderful Mitz Pettel.

​http://bugs.webkit.org/show_bug.cgi?id=11524
Bug 11524: REGRESSION(r9842): Array.prototype.join should use ToString operator rather than calling toString on each element

• kjs/array_object.cpp: (ArrayProtoFunc::callAsFunction): Use ToString operator on each element rather than calling their toString method.

2006-11-06 Mark Rowe <​[email protected]>

Reviewed by the wonderful Mitz Pettel.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=11524
Bug 11524: REGRESSION(r9842): Array.prototype.join should use ToString operator rather than calling toString on each element

• fast/js/array-join-bug-11524-expected.txt: Added.
• fast/js/array-join-bug-11524.html: Added.
• fast/js/resources/array-join-bug-11524.js: Added.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -470 +470 @@
     static HashSet<JSObject*> visitedElems;
     if (visitedElems.contains(thisObj))
-      return jsString("");
+        return jsString("");
     UString separator = ",";
     UString str = "";
@@ -476 +476 @@
     visitedElems.add(thisObj);
     if (id == Join && !args[0]->isUndefined())
-      separator = args[0]->toString(exec);
+        separator = args[0]->toString(exec);
     for (unsigned int k = 0; k < length; k++) {
-      if (k >= 1)
-        str += separator;
-      
-      JSValue *element = thisObj->get(exec, k);
-      if (element->isUndefinedOrNull())
-        continue;
-
-      bool fallback = false;
-      if (id == ToLocaleString) {
-        JSObject *o = element->toObject(exec);
-        JSValue *conversionFunction = o->get(exec, toLocaleStringPropertyName);
-        if (conversionFunction->isObject() && static_cast<JSObject *>(conversionFunction)->implementsCall()) {
-          str += static_cast<JSObject *>(conversionFunction)->call(exec, o, List())->toString(exec);
-        } else {
-          // try toString() fallback
-          fallback = true;
+        if (k >= 1)
+            str += separator;
+
+        JSValue* element = thisObj->get(exec, k);
+        if (element->isUndefinedOrNull())
+            continue;
+
+        bool fallback = false;
+        if (id == ToLocaleString) {
+            JSObject* o = element->toObject(exec);
+            JSValue* conversionFunction = o->get(exec, toLocaleStringPropertyName);
+            if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall())
+                str += static_cast<JSObject*>(conversionFunction)->call(exec, o, List())->toString(exec);
+            else
+                // try toString() fallback
+                fallback = true;
         }
-      }
-
-      if (id == ToString || id == Join || fallback) {
-        if (element->isObject()) {
-          JSObject *o = static_cast<JSObject *>(element);
-          JSValue *conversionFunction = o->get(exec, toStringPropertyName);
-          if (conversionFunction->isObject() && static_cast<JSObject *>(conversionFunction)->implementsCall()) {
-            str += static_cast<JSObject *>(conversionFunction)->call(exec, o, List())->toString(exec);
-          } else {
-            visitedElems.remove(thisObj);
-            return throwError(exec, RangeError, "Can't convert " + o->className() + " object to string");
-          }
-        } else {
-          str += element->toString(exec);
-        }
-      }
-
-      if ( exec->hadException() )
-        break;
+
+        if (id == ToString || id == Join || fallback)
+            str += element->toString(exec);
+
+        if (exec->hadException())
+            break;
     }
     visitedElems.remove(thisObj);