LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-11 01:06:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Remove Object::is_array() in favor of Value::is_array() and RTTI

Browse Source 
It's way too easy to get this wrong: for the IsArray abstract operation,
Value::is_array() needs to be called. Since we have RTTI, the virtual
Object::is_array() method is not needed anymore - if we need to know
whether something is *actually* a JS::Array (we currently check in more
cases than we should, I think) and not a Proxy with an Array target, we
should do that in a way that doesn't look like an abstract operation.
This commit is contained in:
Linus Groh 2021-07-05 18:58:51 +01:00
parent 06ffc0c4db
commit 0ba81dc0b7
Notes: sideshowbarker 2024-07-18 10:18:06 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/0ba81dc0b75
Pull-request: https://github.com/SerenityOS/serenity/pull/8468
8 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Userland/Libraries/LibJS/AST.cpp
View File

@ -1810,7 +1810,7 @@ Value ObjectExpression::execute(Interpreter& interpreter, GlobalObject& global_o
return {};
if (property.type() == ObjectProperty::Type::Spread) {
if (key.is_object() && key.as_object().is_array()) {
if (key.is_object() && is<Array>(key.as_object())) {
auto& array_to_spread = static_cast<Array&>(key.as_object());
for (auto& entry : array_to_spread.indexed_properties()) {
auto value = array_to_spread.get(entry.index());

2
Userland/Libraries/LibJS/MarkupGenerator.cpp
View File

@ -61,7 +61,7 @@ void MarkupGenerator::value_to_html(Value value, StringBuilder& output_html, Has
if (value.is_object()) {
auto& object = value.as_object();
if (object.is_array())
if (is<Array>(object))
return array_to_html(static_cast<const Array&>(object), output_html, seen_objects);
output_html.append(wrap_string_in_style(object.class_name(), StyleType::ObjectType));
if (object.is_function())

2
Userland/Libraries/LibJS/Runtime/Array.cpp
View File

@ -68,7 +68,7 @@ Array* Array::typed_this(VM& vm, GlobalObject& global_object)
auto* this_object = vm.this_value(global_object).to_object(global_object);
if (!this_object)
return {};
if (!this_object->is_array()) {
if (!is<Array>(this_object)) {
vm.throw_exception<TypeError>(global_object, ErrorType::NotAn, "Array");
return nullptr;
}

2
Userland/Libraries/LibJS/Runtime/Array.h
View File

@ -24,8 +24,6 @@ public:
static Array* typed_this(VM&, GlobalObject&);
private:
virtual bool is_array() const override { return true; }
JS_DECLARE_NATIVE_GETTER(length_getter);
JS_DECLARE_NATIVE_SETTER(length_setter);
};

4
Userland/Libraries/LibJS/Runtime/ArrayPrototype.cpp
View File

@ -348,7 +348,7 @@ JS_DEFINE_NATIVE_FUNCTION(ArrayPrototype::push)
auto* this_object = vm.this_value(global_object).to_object(global_object);
if (!this_object)
return {};
if (this_object->is_array()) {
if (is<Array>(this_object)) {
auto* array = static_cast<Array*>(this_object);
for (size_t i = 0; i < vm.argument_count(); ++i)
array->indexed_properties().append(vm.argument(i));
@ -432,7 +432,7 @@ JS_DEFINE_NATIVE_FUNCTION(ArrayPrototype::pop)
auto* this_object = vm.this_value(global_object).to_object(global_object);
if (!this_object)
return {};
if (this_object->is_array()) {
if (is<Array>(this_object)) {
auto* array = static_cast<Array*>(this_object);
if (array->indexed_properties().is_empty())
return js_undefined();

1
Userland/Libraries/LibJS/Runtime/Object.h
View File

@ -132,7 +132,6 @@ public:
void define_native_property(PropertyName const&, Function<Value(VM&, GlobalObject&)> getter, Function<void(VM&, GlobalObject&, Value)> setter, PropertyAttributes attributes);
void define_native_accessor(PropertyName const&, Function<Value(VM&, GlobalObject&)> getter, Function<Value(VM&, GlobalObject&)> setter, PropertyAttributes attributes);
virtual bool is_array() const { return false; }
virtual bool is_function() const { return false; }
virtual bool is_typed_array() const { return false; }
virtual bool is_string_object() const { return false; }

4
Userland/Libraries/LibJS/Runtime/Value.cpp
View File

@ -203,7 +203,7 @@ bool Value::is_array(GlobalObject& global_object) const
if (!is_object())
return false;
auto& object = as_object();
if (object.is_array())
if (is<Array>(object))
return true;
if (is<ProxyObject>(object)) {
auto& proxy = static_cast<ProxyObject const&>(object);
@ -219,7 +219,7 @@ bool Value::is_array(GlobalObject& global_object) const
Array& Value::as_array()
{
VERIFY(is_object() && as_object().is_array());
VERIFY(is_object() && is<Array>(as_object()));
return static_cast<Array&>(*m_value.as_object);
}

2
Userland/Utilities/js.cpp
View File

@ -452,7 +452,7 @@ static void print_value(JS::Value value, HashTable<JS::Object*>& seen_objects)
if (value.is_object()) {
auto& object = value.as_object();
if (object.is_array())
if (is<JS::Array>(object))
return print_array(static_cast<JS::Array&>(object), seen_objects);
if (object.is_function())
return print_function(object, seen_objects);