RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibJS: Fix get_own_property_descriptor_object() field name order

Browse source 
This is defined by the spec: enumerable and configurable come last.
This commit is contained in:
Linus Groh 2021-06-07 23:02:52 +01:00
parent 4e555fae22
commit 8c964ef9f8
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -414,6 +414,8 @@ Optional<PropertyDescriptor> Object::get_own_property_descriptor(const PropertyN
return descriptor; return descriptor;
} }
// Equivalent to:
// 6.2.5.4 FromPropertyDescriptor, https://tc39.es/ecma262/#sec-frompropertydescriptor
Value Object::get_own_property_descriptor_object(const PropertyName& property_name) const Value Object::get_own_property_descriptor_object(const PropertyName& property_name) const
{ {
VERIFY(property_name.is_valid()); VERIFY(property_name.is_valid());
@ -425,12 +427,6 @@ Value Object::get_own_property_descriptor_object(const PropertyName& property_na
auto descriptor = descriptor_opt.value(); auto descriptor = descriptor_opt.value();
auto* descriptor_object = Object::create_empty(global_object()); auto* descriptor_object = Object::create_empty(global_object());
descriptor_object->define_property(vm.names.enumerable, Value(descriptor.attributes.is_enumerable()));
if (vm.exception())
return {};
descriptor_object->define_property(vm.names.configurable, Value(descriptor.attributes.is_configurable()));
if (vm.exception())
return {};
if (descriptor.is_data_descriptor()) { if (descriptor.is_data_descriptor()) {
descriptor_object->define_property(vm.names.value, descriptor.value.value_or(js_undefined())); descriptor_object->define_property(vm.names.value, descriptor.value.value_or(js_undefined()));
if (vm.exception()) if (vm.exception())
@ -450,6 +446,12 @@ Value Object::get_own_property_descriptor_object(const PropertyName& property_na
return {}; return {};
} }
} }
descriptor_object->define_property(vm.names.enumerable, Value(descriptor.attributes.is_enumerable()));
if (vm.exception())
return {};
descriptor_object->define_property(vm.names.configurable, Value(descriptor.attributes.is_configurable()));
if (vm.exception())
return {};
return descriptor_object; return descriptor_object;
} }