Changeset 35142 in webkit for trunk/JavaScriptCore/kjs/CallData.cpp

Timestamp:

Jul 11, 2008, 5:29:24 PM (17 years ago)

Author:

[email protected]

Message:

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

Rubber-stamped by Darin Adler.

Move call function to CallData.cpp and construct to ConstructData.cpp.

• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• kjs/AllInOneFile.cpp:
• kjs/CallData.cpp: Copied from kjs/JSValue.cpp.
• kjs/ConstructData.cpp: Copied from kjs/JSValue.cpp.
• kjs/JSValue.cpp:

File:

• trunk/JavaScriptCore/kjs/CallData.cpp (copied) (copied from trunk/JavaScriptCore/kjs/JSValue.cpp ) (2 diffs)

trunk/JavaScriptCore/kjs/CallData.cpp

@@ -1 +1 @@
 /*
- *  Copyright (C) 1999-2001 Harri Porten ([email protected])
- *  Copyright (C) 2001 Peter Kelly ([email protected])
- *  Copyright (C) 2003, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #include "config.h"
-#include "JSValue.h"
+#include "CallData.h"
 
 #include "JSFunction.h"
-#include <wtf/MathExtras.h>
 
 namespace KJS {
 
-static const double D32 = 4294967296.0;
-
-// 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));
-}
-
-// Declared in CallData.h
 JSValue* call(ExecState* exec, JSValue* functionObject, CallType callType, const CallData& callData, JSValue* thisValue, const ArgList& args)
 {
@@ -112 +40 @@
 }
 
-// Declared in ConstructData.h
-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