summaryrefslogtreecommitdiff
path: root/Libraries
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-01-01 17:00:20 +0100
committerAndreas Kling <kling@serenityos.org>2021-01-01 17:00:20 +0100
commit8333055c3d9e0a05c058cbc4d00845711deb9593 (patch)
tree6dc644a5fed3dc96a9968f9d79a357312288675c /Libraries
parentfc86717f4371e02127709ae0f5db0ef9dc527809 (diff)
downloadserenity-8333055c3d9e0a05c058cbc4d00845711deb9593.zip
LibJS: Use RTTI for inheritance checks
This replaces the hand-rolled string-based inheritance check tech.
Diffstat (limited to 'Libraries')
-rw-r--r--Libraries/LibJS/Runtime/Object.h11
-rw-r--r--Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp4
2 files changed, 6 insertions, 9 deletions
diff --git a/Libraries/LibJS/Runtime/Object.h b/Libraries/LibJS/Runtime/Object.h
index 94b93c1211..50d756ab27 100644
--- a/Libraries/LibJS/Runtime/Object.h
+++ b/Libraries/LibJS/Runtime/Object.h
@@ -39,11 +39,10 @@
namespace JS {
-#define JS_OBJECT(class_, base_class) \
-public: \
- using Base = base_class; \
- virtual const char* class_name() const override { return #class_; } \
- virtual bool inherits(const StringView& class_name) const override { return class_name == #class_ || Base::inherits(class_name); }
+#define JS_OBJECT(class_, base_class) \
+public: \
+ using Base = base_class; \
+ virtual const char* class_name() const override { return #class_; }
struct PropertyDescriptor {
PropertyAttributes attributes;
@@ -67,8 +66,6 @@ public:
virtual void initialize(GlobalObject&) override;
virtual ~Object();
- virtual bool inherits(const StringView& class_name) const { return class_name == this->class_name(); }
-
enum class PropertyKind {
Key,
Value,
diff --git a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp
index 5e314a8674..90cf49ef19 100644
--- a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp
+++ b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp
@@ -639,7 +639,7 @@ static @fully_qualified_name@* impl_from(JS::VM& vm, JS::GlobalObject& global_ob
auto* this_object = vm.this_value(global_object).to_object(global_object);
if (!this_object)
return {};
- if (!this_object->inherits("@wrapper_class@")) {
+ if (!is<@wrapper_class@>(this_object)) {
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "@fully_qualified_name@");
return nullptr;
}
@@ -694,7 +694,7 @@ static @fully_qualified_name@* impl_from(JS::VM& vm, JS::GlobalObject& global_ob
if (vm.exception())
@return_statement@
- if (!@cpp_name@_object->inherits("@parameter.type.name@Wrapper")) {
+ if (!is<@parameter.type.name@Wrapper>(@cpp_name@_object)) {
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "@parameter.type.name@");
@return_statement@
}