mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 16:37:35 +00:00
LibJS: Pass prototype to Error constructors
This commit is contained in:
parent
0df4d2823a
commit
205ac0090d
5 changed files with 30 additions and 15 deletions
|
@ -154,7 +154,7 @@ public:
|
|||
template<typename T, typename... Args>
|
||||
Value throw_exception(Args&&... args)
|
||||
{
|
||||
return throw_exception(heap().allocate<T>(forward<Args>(args)...));
|
||||
return throw_exception(T::create(global_object(), forward<Args>(args)...));
|
||||
}
|
||||
|
||||
Value throw_exception(Exception*);
|
||||
|
|
|
@ -26,14 +26,21 @@
|
|||
|
||||
#include <LibJS/Interpreter.h>
|
||||
#include <LibJS/Runtime/Error.h>
|
||||
#include <LibJS/Runtime/GlobalObject.h>
|
||||
|
||||
namespace JS {
|
||||
|
||||
Error::Error(const FlyString& name, const String& message)
|
||||
Error* Error::create(GlobalObject& global_object, const FlyString& name, const String& message)
|
||||
{
|
||||
auto& interpreter = global_object.interpreter();
|
||||
return interpreter.heap().allocate<Error>(name, message, *interpreter.error_prototype());
|
||||
}
|
||||
|
||||
Error::Error(const FlyString& name, const String& message, Object& prototype)
|
||||
: m_name(name)
|
||||
, m_message(message)
|
||||
{
|
||||
set_prototype(interpreter().error_prototype());
|
||||
set_prototype(&prototype);
|
||||
}
|
||||
|
||||
Error::~Error()
|
||||
|
@ -41,10 +48,14 @@ Error::~Error()
|
|||
}
|
||||
|
||||
#define __JS_ENUMERATE(ClassName, snake_name, PrototypeName, ConstructorName) \
|
||||
ClassName::ClassName(const String& message) \
|
||||
: Error(#ClassName, message) \
|
||||
ClassName* ClassName::create(GlobalObject& global_object, const String& message) \
|
||||
{ \
|
||||
auto& interpreter = global_object.interpreter(); \
|
||||
return interpreter.heap().allocate<ClassName>(message, *interpreter.snake_name##_prototype()); \
|
||||
} \
|
||||
ClassName::ClassName(const String& message, Object& prototype) \
|
||||
: Error(#ClassName, message, prototype) \
|
||||
{ \
|
||||
set_prototype(interpreter().snake_name##_prototype()); \
|
||||
} \
|
||||
ClassName::~ClassName() {} \
|
||||
const char* ClassName::class_name() const { return #ClassName; }
|
||||
|
|
|
@ -33,7 +33,9 @@ namespace JS {
|
|||
|
||||
class Error : public Object {
|
||||
public:
|
||||
Error(const FlyString& name, const String& message);
|
||||
static Error* create(GlobalObject&, const FlyString& name, const String& message);
|
||||
|
||||
Error(const FlyString& name, const String& message, Object& prototype);
|
||||
virtual ~Error() override;
|
||||
|
||||
const FlyString& name() const { return m_name; }
|
||||
|
@ -52,7 +54,9 @@ private:
|
|||
#define DECLARE_ERROR_SUBCLASS(ClassName, snake_name, PrototypeName, ConstructorName) \
|
||||
class ClassName final : public Error { \
|
||||
public: \
|
||||
ClassName(const String& message); \
|
||||
static ClassName* create(GlobalObject&, const String& message); \
|
||||
\
|
||||
ClassName(const String& message, Object& prototype); \
|
||||
virtual ~ClassName() override; \
|
||||
\
|
||||
private: \
|
||||
|
|
|
@ -51,7 +51,7 @@ Value ErrorConstructor::construct(Interpreter& interpreter)
|
|||
String message = "";
|
||||
if (!interpreter.call_frame().arguments.is_empty() && !interpreter.call_frame().arguments[0].is_undefined())
|
||||
message = interpreter.call_frame().arguments[0].to_string();
|
||||
return interpreter.heap().allocate<Error>("Error", message);
|
||||
return Error::create(interpreter.global_object(), "Error", message);
|
||||
}
|
||||
|
||||
#define __JS_ENUMERATE(ClassName, snake_name, PrototypeName, ConstructorName) \
|
||||
|
@ -70,7 +70,7 @@ Value ErrorConstructor::construct(Interpreter& interpreter)
|
|||
String message = ""; \
|
||||
if (!interpreter.call_frame().arguments.is_empty() && !interpreter.call_frame().arguments[0].is_undefined()) \
|
||||
message = interpreter.call_frame().arguments[0].to_string(); \
|
||||
return interpreter.heap().allocate<ClassName>(message); \
|
||||
return ClassName::create(interpreter.global_object(), message); \
|
||||
}
|
||||
|
||||
JS_ENUMERATE_ERROR_SUBCLASSES
|
||||
|
|
|
@ -70,7 +70,7 @@ Value FunctionConstructor::construct(Interpreter& interpreter)
|
|||
auto function_expression = parser.parse_function_node<FunctionExpression>();
|
||||
if (parser.has_errors()) {
|
||||
// FIXME: The parser should expose parsing error strings rather than just fprintf()'ing them
|
||||
return interpreter.heap().allocate<Error>("SyntaxError", "");
|
||||
return Error::create(interpreter.global_object(), "SyntaxError", "");
|
||||
}
|
||||
return function_expression->execute(interpreter);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue