Changeset 34921 in webkit for trunk/JavaScriptCore/kjs/JSCell.cpp

Timestamp:

Jul 1, 2008, 10:32:44 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-01 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Split JSCell and JSNumberCell class declarations out of JSValue.h

• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• VM/JSPropertyNameIterator.h:
• kjs/AllInOneFile.cpp:
• kjs/JSCell.cpp: Copied from JavaScriptCore/kjs/JSValue.cpp.
• kjs/JSCell.h: Copied from JavaScriptCore/kjs/JSValue.h. (KJS::JSValue::getJSNumber):
• kjs/JSNumberCell.cpp:
• kjs/JSNumberCell.h: Copied from JavaScriptCore/kjs/JSValue.h.
• kjs/JSObject.h:
• kjs/JSString.cpp: (KJS::jsString): (KJS::jsOwnedString):
• kjs/JSString.h: (KJS::JSValue::toThisJSString):
• kjs/JSValue.cpp:
• kjs/JSValue.h:

WebCore:

2008-07-01 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Split JSCell and JSNumberCell class declarations out of JSValue.h

• ForwardingHeaders/kjs/JSNumberCell.h: Added.
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/c/c_instance.cpp:

File:

• trunk/JavaScriptCore/kjs/JSCell.cpp (copied) (copied from trunk/JavaScriptCore/kjs/JSValue.cpp ) (4 diffs)

trunk/JavaScriptCore/kjs/JSCell.cpp

@@ -22 +22 @@
 
 #include "config.h"
-#include "JSValue.h"
+#include "JSCell.h"
 
 #include "JSFunction.h"
-#include "nodes.h"
-#include <stdio.h>
-#include <string.h>
+#include "JSString.h"
+#include "JSObject.h"
 #include <wtf/MathExtras.h>
 
@@ -78 +77 @@
 #endif // !(defined NAN && defined INFINITY)
 
-static const double D16 = 65536.0;
-static const double D32 = 4294967296.0;
-
 void* JSCell::operator new(size_t size, ExecState* exec)
 {
@@ -103 +99 @@
 {
     return false;
-}
-
-// ECMA 9.4
-double JSValue::toInteger(ExecState* exec) const
-{
-    int32_t i;
-    if (getTruncatedInt32(i))
-        return i;
-    double d = toNumber(exec);
-    return isnan(d) ? 0.0 : trunc(d);
-}
-
-double JSValue::toIntegerPreserveNaN(ExecState* exec) const
-{
-    int32_t i;
-    if (getTruncatedInt32(i))
-        return i;
-    return trunc(toNumber(exec));
-}
-
-int32_t JSValue::toInt32SlowCase(double d, bool& ok)
-{
-    ok = true;
-
-    if (d >= -D32 / 2 && d < D32 / 2)
-        return static_cast<int32_t>(d);
-
-    if (isnan(d) || isinf(d)) {
-        ok = false;
-        return 0;
-    }
-
-    double d32 = fmod(trunc(d), D32);
-    if (d32 >= D32 / 2)
-        d32 -= D32;
-    else if (d32 < -D32 / 2)
-        d32 += D32;
-    return static_cast<int32_t>(d32);
-}
-
-int32_t JSValue::toInt32SlowCase(ExecState* exec, bool& ok) const
-{
-    return JSValue::toInt32SlowCase(toNumber(exec), ok);
-}
-
-uint32_t JSValue::toUInt32SlowCase(double d, bool& ok)
-{
-    ok = true;
-
-    if (d >= 0.0 && d < D32)
-        return static_cast<uint32_t>(d);
-
-    if (isnan(d) || isinf(d)) {
-        ok = false;
-        return 0;
-    }
-
-    double d32 = fmod(trunc(d), D32);
-    if (d32 < 0)
-        d32 += D32;
-    return static_cast<uint32_t>(d32);
-}
-
-uint32_t JSValue::toUInt32SlowCase(ExecState* exec, bool& ok) const
-{
-    return JSValue::toUInt32SlowCase(toNumber(exec), ok);
-}
-
-float JSValue::toFloat(ExecState* exec) const
-{
-    return static_cast<float>(toNumber(exec));
 }
 
@@ -291 +216 @@
 }
 
-JSString* jsString(ExecState* exec, const char* s)
-{
-    return new (exec) JSString(s ? s : "");
-}
-
-JSString* jsString(ExecState* exec, const UString& s)
-{
-    return s.isNull() ? new (exec) JSString("") : new (exec) JSString(s);
-}
-
-JSString* jsOwnedString(ExecState* exec, const UString& s)
-{
-    return s.isNull() ? new (exec) JSString("", JSString::HasOtherOwner) : new (exec) JSString(s, JSString::HasOtherOwner);
-}
-
-JSValue* call(ExecState* exec, JSValue* functionObject, CallType callType, const CallData& callData, JSValue* thisValue, const ArgList& args)
-{
-    if (callType == CallTypeNative)
-        return callData.native.function(exec, static_cast<JSObject*>(functionObject), thisValue, args);
-    ASSERT(callType == CallTypeJS);
-    // FIXME: Can this be done more efficiently using the callData?
-    return static_cast<JSFunction*>(functionObject)->call(exec, thisValue, args);
-}
-
-JSObject* construct(ExecState* exec, JSValue* object, ConstructType constructType, const ConstructData& constructData, const ArgList& args)
-{
-    if (constructType == ConstructTypeNative)
-        return constructData.native.function(exec, static_cast<JSObject*>(object), args);
-    ASSERT(constructType == ConstructTypeJS);
-    // FIXME: Can this be done more efficiently using the constructData?
-    return static_cast<JSFunction*>(object)->construct(exec, args);
-}
-
 } // namespace KJS