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

Timestamp:

Dec 30, 2007, 11:03:31 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam.

More small cleanup to array_object.cpp

• kjs/array_object.cpp: (KJS::ArrayProtoFuncToString::callAsFunction): (KJS::ArrayProtoFuncToLocaleString::callAsFunction): (KJS::ArrayProtoFuncJoin::callAsFunction): (KJS::ArrayProtoFuncConcat::callAsFunction): (KJS::ArrayProtoFuncReverse::callAsFunction): (KJS::ArrayProtoFuncShift::callAsFunction): (KJS::ArrayProtoFuncSlice::callAsFunction): (KJS::ArrayProtoFuncSort::callAsFunction): (KJS::ArrayProtoFuncSplice::callAsFunction): (KJS::ArrayProtoFuncUnShift::callAsFunction): (KJS::ArrayProtoFuncFilter::callAsFunction): (KJS::ArrayProtoFuncMap::callAsFunction): (KJS::ArrayProtoFuncEvery::callAsFunction):

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -67 +67 @@
 // ECMA 15.4.4
 ArrayPrototype::ArrayPrototype(ExecState*, ObjectPrototype* objProto)
-        : ArrayInstance(objProto, 0)
+    : ArrayInstance(objProto, 0)
 {
 }
@@ -107 +107 @@
             str += separator;
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
             break;
@@ -119 +119 @@
 
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
         }
@@ -149 +149 @@
             str += separator;
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
             break;
@@ -158 +158 @@
             continue;
 
-        bool fallback = false;
         JSObject* o = element->toObject(exec);
         JSValue* conversionFunction = o->get(exec, exec->propertyNames().toLocaleString);
-        if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall()) {
-            List args;
-            str += static_cast<JSObject*>(conversionFunction)->call(exec, o, args)->toString(exec);
-        } else {
-            // try toString() fallback
-            fallback = true;
-        }
-
-        if (fallback)
+        if (conversionFunction->isObject() && static_cast<JSObject*>(conversionFunction)->implementsCall())
+            str += static_cast<JSObject*>(conversionFunction)->call(exec, o, List::empty())->toString(exec);
+        else
             str += element->toString(exec);
 
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
         }
@@ -203 +196 @@
             str += separator;
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
             break;
@@ -215 +208 @@
 
         if (str.isNull()) {
-            JSObject *error = Error::create(exec, GeneralError, "Out of memory");
+            JSObject* error = Error::create(exec, GeneralError, "Out of memory");
             exec->setException(error);
         }
@@ -230 +223 @@
     JSObject* arr = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
     int n = 0;
-    JSValue *curArg = thisObj;
-    JSObject *curObj = static_cast<JSObject *>(thisObj);
+    JSValue* curArg = thisObj;
+    JSObject* curObj = static_cast<JSObject* >(thisObj);
     List::const_iterator it = args.begin();
     List::const_iterator end = args.end();
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
-    for (;;) {
+    while (1) {
         if (curArg->isObject() && curObj->inherits(&ArrayInstance::info)) {
             unsigned int k = 0;
@@ -242 +235 @@
             length = curObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
             while (k < length) {
-                if (JSValue *v = getProperty(exec, curObj, k))
+                if (JSValue* v = getProperty(exec, curObj, k))
                     arr->put(exec, n, v);
                 n++;
@@ -292 +285 @@
     for (unsigned int k = 0; k < middle; k++) {
         unsigned lk1 = length - k - 1;
-        JSValue *obj2 = getProperty(exec, thisObj, lk1);
-        JSValue *obj = getProperty(exec, thisObj, k);
+        JSValue* obj2 = getProperty(exec, thisObj, lk1);
+        JSValue* obj = getProperty(exec, thisObj, k);
 
         if (obj2)
@@ -319 +312 @@
         result = thisObj->get(exec, 0);
         for (unsigned int k = 1; k < length; k++) {
-            if (JSValue *obj = getProperty(exec, thisObj, k))
-                thisObj->put(exec, k-1, obj);
+            if (JSValue* obj = getProperty(exec, thisObj, k))
+                thisObj->put(exec, k - 1, obj);
             else
-                thisObj->deleteProperty(exec, k-1);
+                thisObj->deleteProperty(exec, k - 1);
         }
         thisObj->deleteProperty(exec, length - 1);
@@ -335 +328 @@
 
     // We return a new array
-    JSObject *resObj = static_cast<JSObject *>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec,List::empty()));
+    JSObject* resObj = static_cast<JSObject* >(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
     JSValue* result = resObj;
     double begin = args[0]->toInteger(exec);
@@ -366 +359 @@
     int e = static_cast<int>(end);
     for (int k = b; k < e; k++, n++) {
-        if (JSValue *v = getProperty(exec, thisObj, k))
+        if (JSValue* v = getProperty(exec, thisObj, k))
             resObj->put(exec, n, v);
     }
@@ -375 +368 @@
 JSValue* ArrayProtoFuncSort::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
-#if 0
-    printf("KJS Array::Sort length=%d\n", length);
-    for (unsigned int i = 0 ; i<length ; ++i)
-        printf("KJS Array::Sort: %d: %s\n", i, thisObj->get(exec, i)->toString(exec).ascii());
-#endif
-    JSObject *sortFunction = NULL;
+    JSObject* sortFunction = 0;
     if (!args[0]->isUndefined()) {
         sortFunction = args[0]->toObject(exec);
         if (!sortFunction->implementsCall())
-            sortFunction = NULL;
+            sortFunction = 0;
     }
 
     if (thisObj->classInfo() == &ArrayInstance::info) {
         if (sortFunction)
-            ((ArrayInstance *)thisObj)->sort(exec, sortFunction);
+            static_cast<ArrayInstance*>(thisObj)->sort(exec, sortFunction);
         else
-            ((ArrayInstance *)thisObj)->sort(exec);
+            static_cast<ArrayInstance*>(thisObj)->sort(exec);
         return thisObj;
     }
@@ -397 +385 @@
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
 
-    if (length == 0) {
+    if (!length) {
         thisObj->put(exec, exec->propertyNames().length, jsNumber(0), DontEnum | DontDelete);
         return thisObj;
@@ -404 +392 @@
     // "Min" sort. Not the fastest, but definitely less code than heapsort
     // or quicksort, and much less swapping than bubblesort/insertionsort.
-    for (unsigned int i = 0 ; i<length-1 ; ++i) {
-        JSValue *iObj = thisObj->get(exec,i);
+    for (unsigned int i = 0 ; i < length - 1 ; ++i) {
+        JSValue* iObj = thisObj->get(exec, i);
         unsigned int themin = i;
-        JSValue *minObj = iObj;
-        for (unsigned int j = i+1 ; j<length ; ++j) {
-            JSValue *jObj = thisObj->get(exec,j);
-            double cmp;
-            if (jObj->isUndefined()) {
-                cmp = 1; // don't check minObj because there's no need to differentiate == (0) from > (1)
-            } else if (minObj->isUndefined()) {
-                cmp = -1;
-            } else if (sortFunction) {
+        JSValue* minObj = iObj;
+        for (unsigned int j = i + 1 ; j < length ; ++j) {
+            JSValue* jObj = thisObj->get(exec, j);
+            double compareResult;
+            if (jObj->isUndefined())
+                compareResult = 1; // don't check minObj because there's no need to differentiate == (0) from > (1)
+            else if (minObj->isUndefined())
+                compareResult = -1;
+            else if (sortFunction) {
                 List l;
                 l.append(jObj);
                 l.append(minObj);
-                cmp = sortFunction->call(exec, exec->dynamicGlobalObject(), l)->toNumber(exec);
-            } else {
-                cmp = (jObj->toString(exec) < minObj->toString(exec)) ? -1 : 1;
-            }
-            if (cmp < 0) {
+                compareResult = sortFunction->call(exec, exec->dynamicGlobalObject(), l)->toNumber(exec);
+            } else
+                compareResult = (jObj->toString(exec) < minObj->toString(exec)) ? -1 : 1;
+
+            if (compareResult < 0) {
                 themin = j;
                 minObj = jObj;
@@ -430 +418 @@
         // Swap themin and i
         if (themin > i) {
-            //printf("KJS Array::Sort: swapping %d and %d\n", i, themin);
             thisObj->put(exec, i, minObj);
             thisObj->put(exec, themin, iObj);
         }
     }
-#if 0
-    printf("KJS Array::Sort -- Resulting array:\n");
-    for (unsigned int i = 0 ; i<length ; ++i)
-        printf("KJS Array::Sort: %d: %s\n", i, thisObj->get(exec, i)->toString(exec).ascii());
-#endif
     return thisObj;
 }
@@ -446 +428 @@
 {
     // 15.4.4.12
-    JSObject *resObj = static_cast<JSObject *>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
+    JSObject* resObj = static_cast<JSObject* >(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
     JSValue* result = resObj;
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -457 +439 @@
 
     for (unsigned int k = 0; k < deleteCount; k++) {
-        if (JSValue *v = getProperty(exec, thisObj, k+begin))
+        if (JSValue* v = getProperty(exec, thisObj, k + begin))
             resObj->put(exec, k, v);
     }
@@ -466 +448 @@
         if (additionalArgs < deleteCount) {
             for (unsigned int k = begin; k < length - deleteCount; ++k) {
-                if (JSValue *v = getProperty(exec, thisObj, k+deleteCount))
-                    thisObj->put(exec, k+additionalArgs, v);
+                if (JSValue* v = getProperty(exec, thisObj, k + deleteCount))
+                    thisObj->put(exec, k + additionalArgs, v);
                 else
-                    thisObj->deleteProperty(exec, k+additionalArgs);
+                    thisObj->deleteProperty(exec, k + additionalArgs);
             }
             for (unsigned int k = length ; k > length - deleteCount + additionalArgs; --k)
-                thisObj->deleteProperty(exec, k-1);
+                thisObj->deleteProperty(exec, k - 1);
         } else {
             for (unsigned int k = length - deleteCount; (int)k > begin; --k) {
-                if (JSValue *obj = getProperty(exec, thisObj, k + deleteCount - 1))
+                if (JSValue* obj = getProperty(exec, thisObj, k + deleteCount - 1))
                     thisObj->put(exec, k + additionalArgs - 1, obj);
                 else
-                    thisObj->deleteProperty(exec, k+additionalArgs-1);
+                    thisObj->deleteProperty(exec, k + additionalArgs - 1);
             }
         }
     }
-    for (unsigned int k = 0; k < additionalArgs; ++k) {
-        thisObj->put(exec, k+begin, args[k+2]);
-    }
+    for (unsigned int k = 0; k < additionalArgs; ++k)
+        thisObj->put(exec, k + begin, args[k + 2]);
+
     thisObj->put(exec, exec->propertyNames().length, jsNumber(length - deleteCount + additionalArgs), DontEnum | DontDelete);
     return result;
@@ -495 +477 @@
     unsigned int nrArgs = args.size();
     for (unsigned int k = length; k > 0; --k) {
-        if (JSValue *v = getProperty(exec, thisObj, k - 1))
-            thisObj->put(exec, k+nrArgs-1, v);
+        if (JSValue* v = getProperty(exec, thisObj, k - 1))
+            thisObj->put(exec, k + nrArgs-1, v);
         else
-            thisObj->deleteProperty(exec, k+nrArgs-1);
+            thisObj->deleteProperty(exec, k + nrArgs-1);
     }
     for (unsigned int k = 0; k < nrArgs; ++k)
@@ -514 +496 @@
         return throwError(exec, TypeError);
 
-    JSObject *applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
-    JSObject *resultArray = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
+    JSObject* resultArray = static_cast<JSObject*>(exec->lexicalGlobalObject()->arrayConstructor()->construct(exec, List::empty()));
 
     unsigned filterIndex = 0;
@@ -525 +507 @@
             continue;
 
-        JSValue *v = slot.getValue(exec, thisObj, k);
+        JSValue* v = slot.getValue(exec, thisObj, k);
 
         List eachArguments;
@@ -533 +515 @@
         eachArguments.append(thisObj);
 
-        JSValue *result = eachFunction->call(exec, applyThis, eachArguments);
+        JSValue* result = eachFunction->call(exec, applyThis, eachArguments);
 
         if (result->toBoolean(exec))
@@ -547 +529 @@
         return throwError(exec, TypeError);
 
-    JSObject *applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
 
     unsigned length = thisObj->get(exec, exec->propertyNames().length)->toUInt32(exec);
@@ -560 +542 @@
             continue;
 
-        JSValue *v = slot.getValue(exec, thisObj, k);
+        JSValue* v = slot.getValue(exec, thisObj, k);
 
         List eachArguments;
@@ -568 +550 @@
         eachArguments.append(thisObj);
 
-        JSValue *result = eachFunction->call(exec, applyThis, eachArguments);
+        JSValue* result = eachFunction->call(exec, applyThis, eachArguments);
         resultArray->put(exec, k, result);
     }
@@ -582 +564 @@
 JSValue* ArrayProtoFuncEvery::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
-    JSObject *eachFunction = args[0]->toObject(exec);
+    JSObject* eachFunction = args[0]->toObject(exec);
 
     if (!eachFunction->implementsCall())
         return throwError(exec, TypeError);
 
-    JSObject *applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
+    JSObject* applyThis = args[1]->isUndefinedOrNull() ? exec->dynamicGlobalObject() :  args[1]->toObject(exec);
 
     JSValue* result = jsBoolean(true);
@@ -732 +714 @@
 // ------------------------------ ArrayObjectImp -------------------------------
 
-ArrayObjectImp::ArrayObjectImp(ExecState *exec,
-                               FunctionPrototype *funcProto,
-                               ArrayPrototype *arrayProto)
+ArrayObjectImp::ArrayObjectImp(ExecState* exec,
+                               FunctionPrototype* funcProto,
+                               ArrayPrototype* arrayProto)
         : InternalFunctionImp(funcProto)
 {
@@ -750 +732 @@
 
 // ECMA 15.4.2
-JSObject *ArrayObjectImp::construct(ExecState *exec, const List &args)
+JSObject* ArrayObjectImp::construct(ExecState* exec, const List& args)
 {
     // a single numeric argument denotes the array size (!)
@@ -765 +747 @@
 
 // ECMA 15.6.1
-JSValue *ArrayObjectImp::callAsFunction(ExecState *exec, JSObject *, const List &args)
+JSValue* ArrayObjectImp::callAsFunction(ExecState* exec, JSObject*, const List& args)
 {
     // equivalent to 'new Array(....)'