RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

LibJS: Use MarkedValueList for internal own properties getter functions

Browse source 
Letting these create and return a JS::Array directly is pretty awkward
since we then need to go through the indexed properties for iteration.
Just use a MarkedValueList (i.e. Vector<Value>) for this and add a new
Array::create_from() function to turn the Vector into a returnable
Array as we did before.

This brings it a lot closer to the spec as well, which uses the
CreateArrayFromList abstract operation to do exactly this.

There's an optimization opportunity for the future here, since we know
the Vector's size we could prepare the newly created Array accordingly,
e.g. by switching to generic storage upfront if needed.
This commit is contained in:
Linus Groh 2021-04-06 21:39:17 +02:00 • committed by Andreas Kling
parent a42886d8ff
commit 1c3eef5317
7 changed files with 37 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Userland/Libraries/LibJS/Runtime/Object.cpp
View file

@ -187,9 +187,9 @@ Value Object::get_own_property(const PropertyName& property_name, Value receiver
return value_here;
}
Value Object::get_own_properties(PropertyKind kind, bool only_enumerable_properties, GetOwnPropertyReturnType return_type) const
MarkedValueList Object::get_own_properties(PropertyKind kind, bool only_enumerable_properties, GetOwnPropertyReturnType return_type) const
{
auto* properties_array = Array::create(global_object());
MarkedValueList properties(heap());
// FIXME: Support generic iterables
if (is<StringObject>(*this)) {
@ -197,54 +197,51 @@ Value Object::get_own_properties(PropertyKind kind, bool only_enumerable_propert
for (size_t i = 0; i < str.length(); ++i) {
if (kind == PropertyKind::Key) {
properties_array->define_property(i, js_string(vm(), String::number(i)));
properties.append(js_string(vm(), String::number(i)));
} else if (kind == PropertyKind::Value) {
properties_array->define_property(i, js_string(vm(), String::formatted("{:c}", str[i])));
properties.append(js_string(vm(), String::formatted("{:c}", str[i])));
} else {
auto* entry_array = Array::create(global_object());
entry_array->define_property(0, js_string(vm(), String::number(i)));
entry_array->define_property(1, js_string(vm(), String::formatted("{:c}", str[i])));
properties_array->define_property(i, entry_array);
properties.append(entry_array);
}
if (vm().exception())
return {};
return MarkedValueList { heap() };
}
return properties_array;
return properties;
}
size_t property_index = 0;
for (auto& entry : m_indexed_properties) {
auto value_and_attributes = entry.value_and_attributes(const_cast<Object*>(this));
if (only_enumerable_properties && !value_and_attributes.attributes.is_enumerable())
continue;
if (kind == PropertyKind::Key) {
properties_array->define_property(property_index, js_string(vm(), String::number(entry.index())));
properties.append(js_string(vm(), String::number(entry.index())));
} else if (kind == PropertyKind::Value) {
properties_array->define_property(property_index, value_and_attributes.value);
properties.append(value_and_attributes.value);
} else {
auto* entry_array = Array::create(global_object());
entry_array->define_property(0, js_string(vm(), String::number(entry.index())));
entry_array->define_property(1, value_and_attributes.value);
properties_array->define_property(property_index, entry_array);
properties.append(entry_array);
}
if (vm().exception())
return {};
++property_index;
return MarkedValueList { heap() };
}
auto add_property_to_results = [&](auto& property) {
if (kind == PropertyKind::Key) {
properties_array->define_property(property_index, property.key.to_value(vm()));
properties.append(property.key.to_value(vm()));
} else if (kind == PropertyKind::Value) {
properties_array->define_property(property_index, get(property.key));
properties.append(get(property.key));
} else {
auto* entry_array = Array::create(global_object());
entry_array->define_property(0, property.key.to_value(vm()));
entry_array->define_property(1, get(property.key));
properties_array->define_property(property_index, entry_array);
properties.append(entry_array);
}
};
@ -258,8 +255,7 @@ Value Object::get_own_properties(PropertyKind kind, bool only_enumerable_propert
continue;
add_property_to_results(it);
if (vm().exception())
return {};
++property_index;
return MarkedValueList { heap() };
}
}
if (return_type == GetOwnPropertyReturnType::All || return_type == GetOwnPropertyReturnType::SymbolOnly) {
@ -270,16 +266,15 @@ Value Object::get_own_properties(PropertyKind kind, bool only_enumerable_propert
continue;
add_property_to_results(it);
if (vm().exception())
return {};
++property_index;
return MarkedValueList { heap() };
}
}
return properties_array;
return properties;
}
// 7.3.23 EnumerableOwnPropertyNames, https://tc39.es/ecma262/#sec-enumerableownpropertynames
Value Object::get_enumerable_own_property_names(PropertyKind kind) const
MarkedValueList Object::get_enumerable_own_property_names(PropertyKind kind) const
{
return get_own_properties(kind, true, Object::GetOwnPropertyReturnType::StringOnly);
}