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

LibJS: Replace SymbolPrototype's typed_this() with this_symbol_value()

Browse source 
This brings the code close to the spec with no trade-offs, which is
always valuable.

No functionality change.
This commit is contained in:
Linus Groh 2021-06-06 16:39:29 +01:00 • committed by Andreas Kling
parent 6f96f01171
commit fc2673d111
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Userland/Libraries/LibJS/Runtime/SymbolPrototype.cpp
View file

@ -38,40 +38,36 @@ SymbolPrototype::~SymbolPrototype()
{ {
} }
static SymbolObject* typed_this(VM& vm, GlobalObject& global_object) // thisSymbolValue, https://tc39.es/ecma262/#thissymbolvalue
static Value this_symbol_value(GlobalObject& global_object, Value value)
{ {
auto* this_object = vm.this_value(global_object).to_object(global_object); if (value.is_symbol())
if (!this_object) return value;
return nullptr; if (value.is_object() && is<SymbolObject>(value.as_object()))
if (!is<SymbolObject>(this_object)) { return static_cast<SymbolObject&>(value.as_object()).value_of();
vm.throw_exception<TypeError>(global_object, ErrorType::NotA, "Symbol"); auto& vm = global_object.vm();
return nullptr; vm.throw_exception<TypeError>(global_object, ErrorType::NotA, "Symbol");
} return {};
return static_cast<SymbolObject*>(this_object);
} }
JS_DEFINE_NATIVE_GETTER(SymbolPrototype::description_getter) JS_DEFINE_NATIVE_GETTER(SymbolPrototype::description_getter)
{ {
auto* this_object = typed_this(vm, global_object); auto symbol_value = this_symbol_value(global_object, vm.this_value(global_object));
if (!this_object) if (vm.exception())
return {}; return {};
return js_string(vm, this_object->description()); return js_string(vm, symbol_value.as_symbol().description());
} }
JS_DEFINE_NATIVE_FUNCTION(SymbolPrototype::to_string) JS_DEFINE_NATIVE_FUNCTION(SymbolPrototype::to_string)
{ {
auto* this_object = typed_this(vm, global_object); auto symbol_value = this_symbol_value(global_object, vm.this_value(global_object));
if (!this_object) if (vm.exception())
return {}; return {};
auto string = this_object->primitive_symbol().to_string(); return js_string(vm, symbol_value.as_symbol().to_string());
return js_string(vm, move(string));
} }
JS_DEFINE_NATIVE_FUNCTION(SymbolPrototype::value_of) JS_DEFINE_NATIVE_FUNCTION(SymbolPrototype::value_of)
{ {
auto* this_object = typed_this(vm, global_object); return this_symbol_value(global_object, vm.this_value(global_object));
if (!this_object)
return {};
return this_object->value_of();
} }
} }