Changeset 56081 in webkit for trunk/JavaScriptCore/wtf/StdLibExtras.h

Timestamp:

Mar 16, 2010, 1:46:02 PM (15 years ago)

Author:

Darin Adler

Message:

Added arrayLength function and used it instead of hand-written code.

Reviewed by Sam Weinig.

• JavaScriptCore.xcodeproj/project.pbxproj:

Removed PtrAndFlags.h. The file was removed long ago.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute): Use arrayLength.

• runtime/Collector.h:

(JSC::CollectorBitmap::count): Remove WTF:: prefix from use
of bitCount. In WTF we inject things into the global namespace
and this is no exception.

• runtime/DatePrototype.cpp:

(JSC::formatLocaleDate): Use arrayLength.

• runtime/JSFunction.h:

(JSC::JSFunction::nativeFunction): Remove WTF:: prefix as above.
(JSC::JSFunction::scopeChain): Ditto.
(JSC::JSFunction::setScopeChain): Ditto.
(JSC::JSFunction::setNativeFunction): Ditto.

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset): Use arrayLength.

• runtime/JSImmediate.h:

(JSC::reinterpretDoubleToIntptr): Remove WTF:: prefix as above.
(JSC::reinterpretIntptrToDouble): Ditto.

• runtime/JSONObject.cpp:

(JSC::Stringifier::appendQuotedString): Use arrayLength.
(JSC::Stringifier::toJSON): Ditto.
(JSC::Stringifier::appendStringifiedValue): Ditto.

• runtime/SmallStrings.cpp:

(JSC::SmallStrings::SmallStrings): Ditto.

• runtime/UString.cpp:

(JSC::UString::from): Use arrayLength.

• wtf/StdLibExtras.h:

(WTF::bitwise_cast): Marked this inline!
(WTF::arrayLength): Added function template (actually written by Sam).
Added using declarations for public things in WTF namespace defined
in this file.

File:

• trunk/JavaScriptCore/wtf/StdLibExtras.h (modified) (4 diffs)

trunk/JavaScriptCore/wtf/StdLibExtras.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +27 @@
 #define WTF_StdLibExtras_h
 
+#include <stdlib.h>
 #include <wtf/Assertions.h>
 
@@ -54 +55 @@
 namespace WTF {
 
-    /*
-     * C++'s idea of a reinterpret_cast lacks sufficient cojones.
-     */
+    // C++'s idea of a reinterpret_cast lacks sufficient cojones.
     template<typename TO, typename FROM>
-    TO bitwise_cast(FROM from)
+    inline TO bitwise_cast(FROM from)
     {
         COMPILE_ASSERT(sizeof(TO) == sizeof(FROM), WTF_bitwise_cast_sizeof_casted_types_is_equal);
@@ -77 +76 @@
     }
 
+    // Returns the length of an array. Use instead of macros such as ARRAYSIZE.
+    template<class ElementType, size_t length>
+    inline size_t arrayLength(ElementType (&)[length])
+    {
+        return length;
+    }
+
 } // namespace WTF
 
+using WTF::arrayLength;
+using WTF::bitCount;
+using WTF::bitwise_cast;
+
 #endif