Changeset 56081 in webkit for trunk/JavaScriptCore/runtime/JSFunction.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/runtime/JSFunction.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/JSFunction.h

@@ -67 +67 @@
         NativeFunction nativeFunction()
         {
-            return *WTF::bitwise_cast<NativeFunction*>(m_data);
+            return *bitwise_cast<NativeFunction*>(m_data);
         }
 
@@ -99 +99 @@
         {
             ASSERT(!isHostFunctionNonInline());
-            return *WTF::bitwise_cast<ScopeChain*>(m_data);
+            return *bitwise_cast<ScopeChain*>(m_data);
         }
         void clearScopeChain()
@@ -114 +114 @@
         {
             ASSERT(!isHostFunctionNonInline());
-            *WTF::bitwise_cast<ScopeChain*>(m_data) = sc;
+            *bitwise_cast<ScopeChain*>(m_data) = sc;
         }
         void setNativeFunction(NativeFunction func)
         {
-            *WTF::bitwise_cast<NativeFunction*>(m_data) = func;
+            *bitwise_cast<NativeFunction*>(m_data) = func;
         }
         unsigned char m_data[sizeof(void*)];