LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-27 05:05:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibJS: Improve Reference::get() TypeError message for nullish base

Browse Source 
"ToObject on null or undefined" is useless.
"Cannot get property 'foo' of undefined" isn't.
This commit is contained in:
Linus Groh 2021-04-14 22:17:42 +02:00 committed by Andreas Kling
parent 73a92c79b8
commit 51a5427419
Notes: sideshowbarker 2024-07-18 20:20:26 +09:00 
Author: https://github.com/linusg
Commit: https://github.com/SerenityOS/serenity/commit/51a5427419e
Pull-request: https://github.com/SerenityOS/serenity/pull/6328
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Userland/Libraries/LibJS/Runtime/ErrorTypes.h
View File

@ -148,8 +148,9 @@
"target is non-extensible") \
M(ProxyTwoArguments, "Proxy constructor requires at least two arguments") \
M(ReduceNoInitial, "Reduce of empty array with no initial value") \
M(ReferenceNullishAssignment, "Cannot set property '{}' of {}") \
M(ReferencePrimitiveAssignment, "Cannot set property '{}' of {} '{}'") \
M(ReferenceNullishGetProperty, "Cannot get property '{}' of {}") \
M(ReferenceNullishSetProperty, "Cannot set property '{}' of {}") \
M(ReferencePrimitiveSetProperty, "Cannot set property '{}' of {} '{}'") \
M(ReferenceUnresolvable, "Unresolvable reference") \
M(ReflectArgumentMustBeAFunction, "First argument of Reflect.{}() must be a function") \
M(ReflectArgumentMustBeAnObject, "First argument of Reflect.{}() must be an object") \

16
Userland/Libraries/LibJS/Runtime/Reference.cpp
View File

@ -51,15 +51,15 @@ void Reference::put(GlobalObject& global_object, Value value)
if (!base.is_object() && vm.in_strict_mode()) {
if (base.is_nullish())
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishAssignment, m_name.to_value(global_object.vm()).to_string_without_side_effects(), base.to_string_without_side_effects());
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishSetProperty, m_name.to_value(vm).to_string_without_side_effects(), base.to_string_without_side_effects());
else
vm.throw_exception<TypeError>(global_object, ErrorType::ReferencePrimitiveAssignment, m_name.to_value(global_object.vm()).to_string_without_side_effects(), base.typeof(), base.to_string_without_side_effects());
vm.throw_exception<TypeError>(global_object, ErrorType::ReferencePrimitiveSetProperty, m_name.to_value(vm).to_string_without_side_effects(), base.typeof(), base.to_string_without_side_effects());
return;
}
if (base.is_nullish()) {
// This will always fail the to_object() call below, let's throw the TypeError ourselves with a nice message instead.
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishAssignment, m_name.to_value(global_object.vm()).to_string_without_side_effects(), base.to_string_without_side_effects());
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishSetProperty, m_name.to_value(vm).to_string_without_side_effects(), base.to_string_without_side_effects());
return;
}
@ -103,7 +103,15 @@ Value Reference::get(GlobalObject& global_object)
return value;
}
auto* object = base().to_object(global_object);
auto base = this->base();
if (base.is_nullish()) {
// This will always fail the to_object() call below, let's throw the TypeError ourselves with a nice message instead.
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishGetProperty, m_name.to_value(vm).to_string_without_side_effects(), base.to_string_without_side_effects());
return {};
}
auto* object = base.to_object(global_object);
if (!object)
return {};