Changeset 5436 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Nov 10, 2003, 8:31:34 AM (22 years ago)

Author:

darin

Message:

Reviewed by John.

• fixed 3477528 -- array.sort(function) fails if the function returns a non-zero value that rounds to zero

• kjs/array_object.cpp: (compareByStringForQSort): Added checks for undefined values to match what the specification calls for. (compareWithCompareFunctionForQSort): Added checks for undefined values as above, and also changed the code that looks at the compare function result to look at the number returned without rounding to an integer. (ArrayProtoFuncImp::call): Changed the code that looks at the compare function result to look at the number returned without rounding to an integer.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -280 +280 @@
 {
     ExecState *exec = execForCompareByStringForQSort;
-    return compare(Value(*(ValueImp **)a).toString(exec), Value(*(ValueImp **)b).toString(exec));
+    ValueImp *va = *(ValueImp **)a;
+    ValueImp *vb = *(ValueImp **)b;
+    if (va->dispatchType() == UndefinedType) {
+        return vb->dispatchType() == UndefinedType ? 0 : 1;
+    }
+    if (vb->dispatchType() == UndefinedType) {
+        return -1;
+    }
+    return compare(va->dispatchToString(exec), vb->dispatchToString(exec));
 }
 
@@ -313 +321 @@
 {
     CompareWithCompareFunctionArguments *args = compareWithCompareFunctionArguments;
-    
+
+    ValueImp *va = *(ValueImp **)a;
+    ValueImp *vb = *(ValueImp **)b;
+    if (va->dispatchType() == UndefinedType) {
+        return vb->dispatchType() == UndefinedType ? 0 : 1;
+    }
+    if (vb->dispatchType() == UndefinedType) {
+        return -1;
+    }
+
     args->arguments.clear();
-    args->arguments.append(*(ValueImp **)a);
-    args->arguments.append(*(ValueImp **)b);
-    return args->compareFunction->call(args->exec, args->globalObject, args->arguments)
-        .toInt32(args->exec);
+    args->arguments.append(va);
+    args->arguments.append(vb);
+    double compareResult = args->compareFunction->call
+        (args->exec, args->globalObject, args->arguments).toNumber(args->exec);
+    return compareResult < 0 ? -1 : compareResult > 0 ? 1 : 0;
 }
 
@@ -626 +644 @@
           {
             Value jObj = thisObj.get(exec,j);
-            int cmp;
+            double cmp;
             if (jObj.type() == UndefinedType) {
-              cmp = 1;
+              cmp = 1; // don't check minObj because there's no need to differentiate == (0) from > (1)
             } else if (minObj.type() == UndefinedType) {
               cmp = -1;
@@ -635 +653 @@
                 l.append(jObj);
                 l.append(minObj);
-                cmp = sortFunction.call(exec, exec->interpreter()->globalObject(), l).toInt32(exec);
+                cmp = sortFunction.call(exec, exec->interpreter()->globalObject(), l).toNumber(exec);
             } else {
               cmp = (jObj.toString(exec) < minObj.toString(exec)) ? -1 : 1;