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

Timestamp:

Dec 30, 2007, 11:02:26 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam.

Remove maxInt/minInt, replacing with std:max/min<int>()

• kjs/array_object.cpp: (KJS::ArrayProtoFuncSplice::callAsFunction):
• kjs/operations.cpp:
• kjs/operations.h:

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -32 +32 @@
 #include <wtf/Assertions.h>
 #include <wtf/HashSet.h>
+
+#include <algorithm> // for std::min
 
 namespace KJS {
@@ -449 +451 @@
 JSValue* ArrayProtoFuncSplice::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
-    // 15.4.4.12 - oh boy this is huge
+    // 15.4.4.12
     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);
     int begin = args[0]->toUInt32(exec);
-    if ( begin < 0 )
-      begin = maxInt( begin + length, 0 );
+    if (begin < 0)
+        begin = std::max<int>(begin + length, 0);
     else
-      begin = minInt( begin, length );
-    unsigned int deleteCount = minInt( maxInt( args[1]->toUInt32(exec), 0 ), length - begin );
-
-    //printf( "Splicing from %d, deleteCount=%d \n", begin, deleteCount );
+        begin = std::min<int>(begin, length);
+    unsigned int deleteCount = std::min<int>(std::max<int>(args[1]->toUInt32(exec), 0), length - begin);
+
     for(unsigned int k = 0; k < deleteCount; k++) {
       if (JSValue *v = getProperty(exec, thisObj, k+begin))
@@ -467 +468 @@
     resObj->put(exec, exec->propertyNames().length, jsNumber(deleteCount), DontEnum | DontDelete);
 
-    unsigned int additionalArgs = maxInt( args.size() - 2, 0 );
+    unsigned int additionalArgs = std::max<int>(args.size() - 2, 0);
     if ( additionalArgs != deleteCount )
     {