X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/ba379fdc102753d6be2c4d937058fe40257329fe..ed1e77d3adeb83d26fd1dfb16dd84cabdcefd250:/runtime/GetterSetter.cpp?ds=sidebyside

diff --git a/runtime/GetterSetter.cpp b/runtime/GetterSetter.cpp
index cd1b40a..2cd66e5 100644
--- a/runtime/GetterSetter.cpp
+++ b/runtime/GetterSetter.cpp
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
  *  Copyright (C) 2001 Peter Kelly (pmk@post.com)
- *  Copyright (C) 2004, 2007, 2008 Apple Inc. All rights reserved.
+ *  Copyright (C) 2004, 2007, 2008, 2009, 2014 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
@@ -23,62 +23,86 @@
 #include "config.h"
 #include "GetterSetter.h"
 
+#include "Error.h"
+#include "Exception.h"
 #include "JSObject.h"
+#include "JSCInlines.h"
 #include <wtf/Assertions.h>
 
 namespace JSC {
 
-void GetterSetter::mark()
-{
-    JSCell::mark();
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(GetterSetter);
 
-    if (m_getter && !m_getter->marked())
-        m_getter->mark();
-    if (m_setter && !m_setter->marked())
-        m_setter->mark();
-}
+const ClassInfo GetterSetter::s_info = { "GetterSetter", 0, 0, CREATE_METHOD_TABLE(GetterSetter) };
 
-JSValue GetterSetter::toPrimitive(ExecState*, PreferredPrimitiveType) const
+void GetterSetter::visitChildren(JSCell* cell, SlotVisitor& visitor)
 {
-    ASSERT_NOT_REACHED();
-    return jsNull();
-}
+    GetterSetter* thisObject = jsCast<GetterSetter*>(cell);
+    ASSERT_GC_OBJECT_INHERITS(thisObject, info());
+    JSCell::visitChildren(thisObject, visitor);
 
-bool GetterSetter::getPrimitiveNumber(ExecState*, double& number, JSValue& value)
-{
-    ASSERT_NOT_REACHED();
-    number = 0;
-    value = JSValue();
-    return true;
+    visitor.append(&thisObject->m_getter);
+    visitor.append(&thisObject->m_setter);
 }
 
-bool GetterSetter::toBoolean(ExecState*) const
+GetterSetter* GetterSetter::withGetter(VM& vm, JSGlobalObject* globalObject, JSObject* newGetter)
 {
-    ASSERT_NOT_REACHED();
-    return false;
+    if (isGetterNull()) {
+        setGetter(vm, globalObject, newGetter);
+        return this;
+    }
+    
+    GetterSetter* result = GetterSetter::create(vm, globalObject);
+    result->setGetter(vm, globalObject, newGetter);
+    result->setSetter(vm, globalObject, setter());
+    return result;
 }
 
-double GetterSetter::toNumber(ExecState*) const
+GetterSetter* GetterSetter::withSetter(VM& vm, JSGlobalObject* globalObject, JSObject* newSetter)
 {
-    ASSERT_NOT_REACHED();
-    return 0.0;
+    if (isSetterNull()) {
+        setSetter(vm, globalObject, newSetter);
+        return this;
+    }
+    
+    GetterSetter* result = GetterSetter::create(vm, globalObject);
+    result->setGetter(vm, globalObject, getter());
+    result->setSetter(vm, globalObject, newSetter);
+    return result;
 }
 
-UString GetterSetter::toString(ExecState*) const
+JSValue callGetter(ExecState* exec, JSValue base, JSValue getterSetter)
 {
-    ASSERT_NOT_REACHED();
-    return UString::null();
-}
+    // FIXME: Some callers may invoke get() without checking for an exception first.
+    // We work around that by checking here.
+    if (exec->hadException())
+        return exec->exception()->value();
 
-JSObject* GetterSetter::toObject(ExecState* exec) const
-{
-    ASSERT_NOT_REACHED();
-    return jsNull().toObject(exec);
+    JSObject* getter = jsCast<GetterSetter*>(getterSetter)->getter();
+
+    CallData callData;
+    CallType callType = getter->methodTable(exec->vm())->getCallData(getter, callData);
+    return call(exec, getter, callType, callData, base, ArgList());
 }
 
-bool GetterSetter::isGetterSetter() const
+void callSetter(ExecState* exec, JSValue base, JSValue getterSetter, JSValue value, ECMAMode ecmaMode)
 {
-    return true;
+    GetterSetter* getterSetterObj = jsCast<GetterSetter*>(getterSetter);
+
+    if (getterSetterObj->isSetterNull()) {
+        if (ecmaMode == StrictMode)
+            throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+        return;
+    }
+
+    JSObject* setter = getterSetterObj->setter();
+
+    MarkedArgumentBuffer args;
+    args.append(value);
+
+    CallData callData;
+    CallType callType = setter->methodTable(exec->vm())->getCallData(setter, callData);
+    call(exec, setter, callType, callData, base, args);
 }
 
 } // namespace JSC