0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibJS: Use RTTI for inheritance checks

Browse source 
This replaces the hand-rolled string-based inheritance check tech.
This commit is contained in:
Andreas Kling 2021-01-01 17:00:20 +01:00
parent fc86717f43
commit 8333055c3d
Notes: sideshowbarker 2024-07-19 00:16:00 +09:00
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Applications/Spreadsheet/JSIntegration.cpp
View file

@ -419,7 +419,7 @@ JS_DEFINE_NATIVE_FUNCTION(WorkbookObject::sheet)
if (!this_object)
return {};
if (!this_object->inherits("WorkbookObject")) {
if (!is<WorkbookObject>(this_object)) {
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotA, "WorkbookObject");
return {};
}

11
Libraries/LibJS/Runtime/Object.h
View file

@ -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,

4
Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp
View file

@ -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@
}