diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-05 14:34:32 -0800 |
commit | 635860845790a19bf50bbc51ba8fb66a96dde068 (patch) | |
tree | ef6ad9ff73a5b57f65249d4232a202fa77e6a140 /JavaScriptCore/runtime/JSNotAnObject.cpp | |
parent | 8e35f3cfc7fba1d1c829dc557ebad6409cbe16a2 (diff) | |
download | external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.zip external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.gz external_webkit-635860845790a19bf50bbc51ba8fb66a96dde068.tar.bz2 |
auto import from //depot/cupcake/@136594
Diffstat (limited to 'JavaScriptCore/runtime/JSNotAnObject.cpp')
-rw-r--r-- | JavaScriptCore/runtime/JSNotAnObject.cpp | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/JavaScriptCore/runtime/JSNotAnObject.cpp b/JavaScriptCore/runtime/JSNotAnObject.cpp index c4ca8fd..67edfd1 100644 --- a/JavaScriptCore/runtime/JSNotAnObject.cpp +++ b/JavaScriptCore/runtime/JSNotAnObject.cpp @@ -37,45 +37,39 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSNotAnObject); // JSValue methods -JSValue* JSNotAnObject::toPrimitive(ExecState* exec, PreferredPrimitiveType) const +JSValuePtr JSNotAnObject::toPrimitive(ExecState* exec, PreferredPrimitiveType) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return m_exception; } -bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValue*&) +bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValuePtr&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } bool JSNotAnObject::toBoolean(ExecState* exec) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } double JSNotAnObject::toNumber(ExecState* exec) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return NaN; } UString JSNotAnObject::toString(ExecState* exec) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return ""; } JSObject* JSNotAnObject::toObject(ExecState* exec) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return m_exception; } @@ -90,48 +84,41 @@ void JSNotAnObject::mark() // JSObject methods bool JSNotAnObject::getOwnPropertySlot(ExecState* exec, const Identifier&, PropertySlot&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } bool JSNotAnObject::getOwnPropertySlot(ExecState* exec, unsigned, PropertySlot&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } -void JSNotAnObject::put(ExecState* exec, const Identifier& , JSValue*, PutPropertySlot&) +void JSNotAnObject::put(ExecState* exec, const Identifier& , JSValuePtr, PutPropertySlot&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } -void JSNotAnObject::put(ExecState* exec, unsigned, JSValue*) +void JSNotAnObject::put(ExecState* exec, unsigned, JSValuePtr) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } bool JSNotAnObject::deleteProperty(ExecState* exec, const Identifier&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } bool JSNotAnObject::deleteProperty(ExecState* exec, unsigned) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; } void JSNotAnObject::getPropertyNames(ExecState* exec, PropertyNameArray&) { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } } // namespace JSC |