JavaScriptCore-1218.35.tar.gz

[apple/javascriptcore.git] / runtime / ErrorInstance.cpp

diff --git a/runtime/ErrorInstance.cpp b/runtime/ErrorInstance.cpp
index ed95ba4a1778def2a4aae986e40e2b0f82154791..e8f7ac16231eb9a9f8cfd7d8123184850b9350f8 100644 (file)
--- a/runtime/ErrorInstance.cpp
+++ b/runtime/ErrorInstance.cpp
@@ -21,36 +21,19 @@
 #include "config.h"
 #include "ErrorInstance.h"
 
 #include "config.h"
 #include "ErrorInstance.h"
 

+#include "JSScope.h"
+#include "Operations.h"
+

 namespace JSC {
 
 namespace JSC {
 

-const ClassInfo ErrorInstance::s_info = { "Error", &JSNonFinalObject::s_info, 0, 0 };
+ASSERT_HAS_TRIVIAL_DESTRUCTOR(ErrorInstance);

 
 

-ErrorInstance::ErrorInstance(JSGlobalData* globalData, Structure* structure)
-    : JSNonFinalObject(*globalData, structure)
-    , m_appendSourceToMessage(false)
-{
-    ASSERT(inherits(&s_info));
-    putDirect(*globalData, globalData->propertyNames->message, jsString(globalData, ""));
-}
+const ClassInfo ErrorInstance::s_info = { "Error", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(ErrorInstance) };

 
 

-ErrorInstance::ErrorInstance(JSGlobalData* globalData, Structure* structure, const UString& message)
-    : JSNonFinalObject(*globalData, structure)
+ErrorInstance::ErrorInstance(VM& vm, Structure* structure)
+    : JSNonFinalObject(vm, structure)

     , m_appendSourceToMessage(false)
 {
     , m_appendSourceToMessage(false)
 {

-    ASSERT(inherits(&s_info));
-    putDirect(*globalData, globalData->propertyNames->message, jsString(globalData, message));
-}
-
-ErrorInstance* ErrorInstance::create(JSGlobalData* globalData, Structure* structure, const UString& message)
-{
-    return new (globalData) ErrorInstance(globalData, structure, message);
-}
-
-ErrorInstance* ErrorInstance::create(ExecState* exec, Structure* structure, JSValue message)
-{
-    if (message.isUndefined())
-        return new (exec) ErrorInstance(&exec->globalData(), structure);
-    return new (exec) ErrorInstance(&exec->globalData(), structure, message.toString(exec));

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC