Changeset 9992 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 31, 2005, 10:02:13 PM (20 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• remove uses of Mac-OS-X-specific MAX macro
• remove one of the many excess "APPLE_CHANGES" ifdefs

• kjs/collector.cpp: (KJS::Collector::allocate): Use std::max instead of MAX.
• kjs/property_map.cpp: (KJS::PropertyMap::rehash): Ditto.
• kjs/ustring.cpp: (KJS::UChar::toLower): Take out non-ICU code path. (KJS::UChar::toUpper): Ditto. (KJS::UString::spliceSubstringsWithSeparators): Use std::max instead of MAX.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (4 diffs)
• kjs/property_map.cpp (modified) (2 diffs)
• kjs/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-07-31  Darin Adler  <[email protected]>
+
+        Reviewed by Maciej.
+
+        - remove uses of Mac-OS-X-specific MAX macro
+        - remove one of the many excess "APPLE_CHANGES" ifdefs
+
+        * kjs/collector.cpp: (KJS::Collector::allocate): Use std::max instead of MAX.
+        * kjs/property_map.cpp: (KJS::PropertyMap::rehash): Ditto.
+        * kjs/ustring.cpp:
+        (KJS::UChar::toLower): Take out non-ICU code path.
+        (KJS::UChar::toUpper): Ditto.
+        (KJS::UString::spliceSubstringsWithSeparators): Use std::max instead of MAX.
+
 2005-07-27  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -27 +27 @@
 #include "value.h"
 
+#include <algorithm>
+
 #if APPLE_CHANGES
 #include <CoreFoundation/CoreFoundation.h>
@@ -34 +36 @@
 #include <mach/thread_act.h>
 #endif
+
+using std::max;
 
 namespace KJS {
@@ -102 +106 @@
     // oversize allocator
     if (heap.usedOversizeCells == heap.numOversizeCells) {
-      heap.numOversizeCells = MAX(MIN_ARRAY_SIZE, heap.numOversizeCells * GROWTH_FACTOR);
+      heap.numOversizeCells = max(MIN_ARRAY_SIZE, heap.numOversizeCells * GROWTH_FACTOR);
       heap.oversizeCells = (CollectorCell **)kjs_fast_realloc(heap.oversizeCells, heap.numOversizeCells * sizeof(CollectorCell *));
     }
@@ -132 +136 @@
     
     if (heap.usedBlocks == heap.numBlocks) {
-      heap.numBlocks = MAX(MIN_ARRAY_SIZE, heap.numBlocks * GROWTH_FACTOR);
+      heap.numBlocks = max(MIN_ARRAY_SIZE, heap.numBlocks * GROWTH_FACTOR);
       heap.blocks = (CollectorBlock **)kjs_fast_realloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock *));
     }

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -27 +27 @@
 #include "reference_list.h"
 
+#include <algorithm>
+
+using std::max;
+
 #define DEBUG_PROPERTIES 0
 #define DO_CONSISTENCY_CHECK 0
@@ -413 +417 @@
             else {
                 int index = entry.index;
-                lastIndexUsed = MAX(index, lastIndexUsed);
+                lastIndexUsed = max(index, lastIndexUsed);
                 insert(key, entry.value, entry.attributes, index);
             }

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -43 +43 @@
 #include "dtoa.h"
 
-#if APPLE_CHANGES
+#include <algorithm>
+
+using std::max;
 
 #include <unicode/uchar.h>
-
-#endif
 
 namespace KJS {
@@ -150 +150 @@
 UChar UChar::toLower() const
 {
-#if APPLE_CHANGES
   return static_cast<unsigned short>(u_tolower(uc));
-#else
-  // ### properly support unicode tolower
-  if (uc >= 256 || islower(uc))
-    return *this;
-
-  return (unsigned char)tolower(uc);
-#endif
 }
 
 UChar UChar::toUpper() const
 {
-#if APPLE_CHANGES
   return static_cast<unsigned short>(u_toupper(uc));
-#else
-  if (uc >= 256 || isupper(uc))
-    return *this;
-
-  return (unsigned char)toupper(uc);
-#endif
 }
 
@@ -641 +626 @@
   UChar *buffer = static_cast<UChar *>(kjs_fast_malloc(totalLength * sizeof(UChar)));
 
-  int maxCount = MAX(rangeCount, separatorCount);
+  int maxCount = max(rangeCount, separatorCount);
   int bufferPos = 0;
   for (int i = 0; i < maxCount; i++) {