JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / runtime / ExceptionHelpers.h

diff --git a/runtime/ExceptionHelpers.h b/runtime/ExceptionHelpers.h
index 66d8136efe2f6ffb20bce62d0d711309d3fe2b48..305ebef9113af01cd3aa274416502c95ae094f72 100644 (file)
--- a/runtime/ExceptionHelpers.h
+++ b/runtime/ExceptionHelpers.h
@@ -29,43 +29,36 @@
 #ifndef ExceptionHelpers_h
 #define ExceptionHelpers_h
 
 #ifndef ExceptionHelpers_h
 #define ExceptionHelpers_h
 

+#include "ErrorInstance.h"

 #include "JSObject.h"
 
 namespace JSC {
 
 #include "JSObject.h"
 
 namespace JSC {
 

-typedef JSObject* (*ErrorFactory)(ExecState*, const String&);
+typedef JSObject* (*ErrorFactory)(ExecState*, const String&, ErrorInstance::SourceAppender);

 
 JSObject* createTerminatedExecutionException(VM*);
 
 JSObject* createTerminatedExecutionException(VM*);

-bool isTerminatedExecutionException(JSObject*);
-JS_EXPORT_PRIVATE bool isTerminatedExecutionException(JSValue);
-JS_EXPORT_PRIVATE JSObject* createError(ExecState*, ErrorFactory, JSValue, const String&);
+JS_EXPORT_PRIVATE bool isTerminatedExecutionException(Exception*);
+JS_EXPORT_PRIVATE JSObject* createError(ExecState*, JSValue, const String&, ErrorInstance::SourceAppender);

 JS_EXPORT_PRIVATE JSObject* createStackOverflowError(ExecState*);
 JS_EXPORT_PRIVATE JSObject* createStackOverflowError(ExecState*);

-JSObject* createStackOverflowError(JSGlobalObject*);
-JSObject* createOutOfMemoryError(JSGlobalObject*);

 JSObject* createUndefinedVariableError(ExecState*, const Identifier&);
 JSObject* createNotAnObjectError(ExecState*, JSValue);
 JSObject* createUndefinedVariableError(ExecState*, const Identifier&);
 JSObject* createNotAnObjectError(ExecState*, JSValue);

-JSObject* createInvalidParameterError(ExecState*, const char* op, JSValue);
+JSObject* createInvalidFunctionApplyParameterError(ExecState*, JSValue);
+JSObject* createInvalidInParameterError(ExecState*, JSValue);
+JSObject* createInvalidInstanceofParameterError(ExecState*, JSValue);

 JSObject* createNotAConstructorError(ExecState*, JSValue);
 JSObject* createNotAFunctionError(ExecState*, JSValue);
 JSObject* createErrorForInvalidGlobalAssignment(ExecState*, const String&);
 JSString* errorDescriptionForValue(ExecState*, JSValue);
 
 JSObject* createNotAConstructorError(ExecState*, JSValue);
 JSObject* createNotAFunctionError(ExecState*, JSValue);
 JSObject* createErrorForInvalidGlobalAssignment(ExecState*, const String&);
 JSString* errorDescriptionForValue(ExecState*, JSValue);
 

-JSObject* throwOutOfMemoryError(ExecState*);
-JSObject* throwStackOverflowError(ExecState*);
-JSObject* throwTerminatedExecutionException(ExecState*);
+JS_EXPORT_PRIVATE JSObject* throwOutOfMemoryError(ExecState*);
+JS_EXPORT_PRIVATE JSObject* throwStackOverflowError(ExecState*);
+JS_EXPORT_PRIVATE JSObject* throwTerminatedExecutionException(ExecState*);

 
 
 
 

-class TerminatedExecutionError : public JSNonFinalObject {
-private:
-    TerminatedExecutionError(VM& vm)
-        : JSNonFinalObject(vm, vm.terminatedExecutionErrorStructure.get())
-    {
-    }
-
-    static JSValue defaultValue(const JSObject*, ExecState*, PreferredPrimitiveType);
-
+class TerminatedExecutionError final : public JSNonFinalObject {

 public:
     typedef JSNonFinalObject Base;
 public:
     typedef JSNonFinalObject Base;

+    static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;

 
     static TerminatedExecutionError* create(VM& vm)
     {
 
     static TerminatedExecutionError* create(VM& vm)
     {


@@ -80,6 +73,15 @@ public:
     }
 
     DECLARE_EXPORT_INFO;
     }
 
     DECLARE_EXPORT_INFO;

+
+private:
+    explicit TerminatedExecutionError(VM& vm)
+        : JSNonFinalObject(vm, vm.terminatedExecutionErrorStructure.get())
+    {
+    }
+
+    static JSValue defaultValue(const JSObject*, ExecState*, PreferredPrimitiveType);
+

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