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

LibJS: Replace StringOrSymbol::from_value with Value::to_property_key

Browse source 
This is a more specification compliant implementation of the
abstract operation 7.1.19 ToPropertyKey which should handle boxed
symbols correctly.
This commit is contained in:
Idan Horowitz 2021-06-05 15:22:11 +03:00 • committed by Linus Groh
parent e72e621d89
commit eb0b1c432a
8 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibJS/Runtime/ObjectConstructor.cpp
View file

@ -202,14 +202,14 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::define_property_)
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObject, "Object argument");
return {};
}
auto property_key = vm.argument(1).to_property_key(global_object);
if (vm.exception())
return {};
if (!vm.argument(2).is_object()) {
vm.throw_exception<TypeError>(global_object, ErrorType::NotAnObject, "Descriptor argument");
return {};
}
auto& object = vm.argument(0).as_object();
auto property_key = StringOrSymbol::from_value(global_object, vm.argument(1));
if (vm.exception())
return {};
auto& descriptor = vm.argument(2).as_object();
if (!object.define_property(property_key, descriptor)) {
if (!vm.exception()) {
@ -316,10 +316,10 @@ JS_DEFINE_NATIVE_FUNCTION(ObjectConstructor::has_own)
auto* object = vm.argument(0).to_object(global_object);
if (vm.exception())
return {};
auto string_or_symbol = StringOrSymbol::from_value(global_object, vm.argument(1));
auto property_key = vm.argument(1).to_property_key(global_object);
if (vm.exception())
return {};
return Value(object->has_own_property(string_or_symbol));
return Value(object->has_own_property(property_key));
}
}