Changeset 34893 in webkit for trunk/JavaScriptCore/kjs/GetterSetter.cpp

Timestamp:

Jun 30, 2008, 1:52:03 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-30 Sam Weinig <​[email protected]>

Rubber-stamped by Darin Adler.

Remove internal.cpp and move its contents to there own .cpp files.

• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• kjs/AllInOneFile.cpp:
• kjs/GetterSetter.cpp: Copied from kjs/internal.cpp.
• kjs/InternalFunction.cpp: Copied from kjs/internal.cpp.
• kjs/JSNumberCell.cpp: Copied from kjs/internal.cpp.
• kjs/JSString.cpp: Copied from kjs/internal.cpp.
• kjs/JSString.h:
• kjs/LabelStack.cpp: Copied from kjs/internal.cpp.
• kjs/NumberConstructor.cpp:
• kjs/NumberObject.cpp: (KJS::constructNumber): (KJS::constructNumberFromImmediateNumber):
• kjs/internal.cpp: Removed.

File:

• trunk/JavaScriptCore/kjs/GetterSetter.cpp (moved) (moved from trunk/JavaScriptCore/kjs/internal.cpp ) (2 diffs)

trunk/JavaScriptCore/kjs/GetterSetter.cpp

@@ -22 +22 @@
 
 #include "config.h"
-#include "JSString.h"
+#include "JSObject.h"
 
-#include "ExecState.h"
-#include "FunctionPrototype.h"
-#include "JSObject.h"
-#include "MathObject.h"
-#include "NumberObject.h"
-#include "StringPrototype.h"
-#include "collector.h"
-#include "debugger.h"
-#include "lexer.h"
-#include "nodes.h"
-#include "operations.h"
-#include <math.h>
-#include <stdio.h>
 #include <wtf/Assertions.h>
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
-#include <wtf/Vector.h>
 
 namespace KJS {
-
-// ------------------------------ JSString ------------------------------------
-
-JSValue* JSString::toPrimitive(ExecState*, JSType) const
-{
-  return const_cast<JSString*>(this);
-}
-
-bool JSString::getPrimitiveNumber(ExecState*, double& number, JSValue*& value)
-{
-    value = this;
-    number = m_value.toDouble();
-    return false;
-}
-
-bool JSString::toBoolean(ExecState*) const
-{
-    return !m_value.isEmpty();
-}
-
-double JSString::toNumber(ExecState*) const
-{
-    return m_value.toDouble();
-}
-
-UString JSString::toString(ExecState*) const
-{
-    return m_value;
-}
-
-UString JSString::toThisString(ExecState*) const
-{
-    return m_value;
-}
-
-JSString* JSString::toThisJSString(ExecState*)
-{
-    return this;
-}
-
-inline StringObject* StringObject::create(ExecState* exec, JSString* string)
-{
-    return new (exec) StringObject(exec->lexicalGlobalObject()->stringPrototype(), string);
-}
-
-JSObject* JSString::toObject(ExecState* exec) const
-{
-    return StringObject::create(exec, const_cast<JSString*>(this));
-}
-
-JSObject* JSString::toThisObject(ExecState* exec) const
-{
-    return StringObject::create(exec, const_cast<JSString*>(this));
-}
-
-JSValue* JSString::lengthGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
-{
-    return jsNumber(exec, static_cast<JSString*>(slot.slotBase())->value().size());
-}
-
-JSValue* JSString::indexGetter(ExecState* exec, const Identifier&, const PropertySlot& slot)
-{
-    return jsString(exec, static_cast<JSString*>(slot.slotBase())->value().substr(slot.index(), 1));
-}
-
-JSValue* JSString::indexNumericPropertyGetter(ExecState* exec, unsigned index, const PropertySlot& slot)
-{
-    return jsString(exec, static_cast<JSString*>(slot.slotBase())->value().substr(index, 1));
-}
-
-bool JSString::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
-{
-    // The semantics here are really getPropertySlot, not getOwnPropertySlot.
-    // This function should only be called by JSValue::get.
-    if (getStringPropertySlot(exec, propertyName, slot))
-        return true;
-    slot.setBase(this);
-    JSObject* object;
-    for (JSValue* prototype = exec->lexicalGlobalObject()->stringPrototype(); prototype != jsNull(); prototype = object->prototype()) {
-        ASSERT(prototype->isObject());
-        object = static_cast<JSObject*>(prototype);
-        if (object->getOwnPropertySlot(exec, propertyName, slot))
-            return true;
-    }
-    slot.setUndefined();
-    return true;
-}
-
-bool JSString::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
-{
-    // The semantics here are really getPropertySlot, not getOwnPropertySlot.
-    // This function should only be called by JSValue::get.
-    if (getStringPropertySlot(propertyName, slot))
-        return true;
-    return JSString::getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot);
-}
-
-// ------------------------------ JSNumberCell ------------------------------------
-
-JSType JSNumberCell::type() const
-{
-    return NumberType;
-}
-
-JSValue* JSNumberCell::toPrimitive(ExecState*, JSType) const
-{
-    return const_cast<JSNumberCell*>(this);
-}
-
-bool JSNumberCell::getPrimitiveNumber(ExecState*, double& number, JSValue*& value)
-{
-    number = val;
-    value = this;
-    return true;
-}
-
-bool JSNumberCell::toBoolean(ExecState *) const
-{
-  return val < 0.0 || val > 0.0; // false for NaN
-}
-
-double JSNumberCell::toNumber(ExecState *) const
-{
-  return val;
-}
-
-UString JSNumberCell::toString(ExecState*) const
-{
-    if (val == 0.0) // +0.0 or -0.0
-        return "0";
-    return UString::from(val);
-}
-
-UString JSNumberCell::toThisString(ExecState*) const
-{
-    if (val == 0.0) // +0.0 or -0.0
-        return "0";
-    return UString::from(val);
-}
-
-JSObject* JSNumberCell::toObject(ExecState* exec) const
-{
-    return constructNumber(exec, const_cast<JSNumberCell*>(this));
-}
-
-JSObject* JSNumberCell::toThisObject(ExecState* exec) const
-{
-    return constructNumber(exec, const_cast<JSNumberCell*>(this));
-}
-
-bool JSNumberCell::getUInt32(uint32_t& uint32) const
-{
-    uint32 = static_cast<uint32_t>(val);
-    return uint32 == val;
-}
-
-bool JSNumberCell::getTruncatedInt32(int32_t& int32) const
-{
-    if (!(val >= -2147483648.0 && val < 2147483648.0))
-        return false;
-    int32 = static_cast<int32_t>(val);
-    return true;
-}
-
-bool JSNumberCell::getTruncatedUInt32(uint32_t& uint32) const
-{
-    if (!(val >= 0.0 && val < 4294967296.0))
-        return false;
-    uint32 = static_cast<uint32_t>(val);
-    return true;
-}
-
-JSValue* JSNumberCell::getJSNumber()
-{
-    return this;
-}
-
-// --------------------------- GetterSetter ---------------------------------
 
 void GetterSetter::mark()
@@ -270 +76 @@
 }
 
-// ------------------------------ LabelStack -----------------------------------
-
-bool LabelStack::push(const Identifier &id)
-{
-  if (contains(id))
-    return false;
-
-  StackElem *newtos = new StackElem;
-  newtos->id = id;
-  newtos->prev = tos;
-  tos = newtos;
-  return true;
 }
-
-bool LabelStack::contains(const Identifier &id) const
-{
-  if (id.isEmpty())
-    return true;
-
-  for (StackElem *curr = tos; curr; curr = curr->prev)
-    if (curr->id == id)
-      return true;
-
-  return false;
-}
-
-// ------------------------------ InternalFunction --------------------------
-
-const ClassInfo InternalFunction::info = { "Function", 0, 0, 0 };
-
-InternalFunction::InternalFunction()
-{
-}
-
-InternalFunction::InternalFunction(FunctionPrototype* prototype, const Identifier& name)
-    : JSObject(prototype)
-    , m_name(name)
-{
-}
-
-bool InternalFunction::implementsHasInstance() const
-{
-    return true;
-}
-
-}