mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 10:22:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibJS: Convert reference deletion to ThrowCompletionOr

Browse source
This commit is contained in:
Idan Horowitz 2021-11-02 18:38:51 +02:00 • committed by Linus Groh
parent 330ac1e5ad
commit d73b258874
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibJS/test-js.cpp
View file

@ -73,7 +73,7 @@ TESTJS_GLOBAL_FUNCTION(mark_as_garbage, markAsGarbage)
return vm.throw_completion<JS::TypeError>(global_object, JS::ErrorType::NotAnObject, String::formatted("Variable with name {}", variable_name.string()));
vm.heap().uproot_cell(&value.as_object());
reference.delete_(global_object);
TRY(reference.delete_(global_object));
return JS::js_undefined();
}

2
Userland/Libraries/LibJS/AST.cpp
View file

@ -1120,7 +1120,7 @@ Value UnaryExpression::execute(Interpreter& interpreter, GlobalObject& global_ob
auto reference = m_lhs->to_reference(interpreter, global_object);
if (interpreter.exception())
return {};
return Value(reference.delete_(global_object));
return Value(TRY_OR_DISCARD(reference.delete_(global_object)));
}
Value lhs_result;

18
Userland/Libraries/LibJS/Runtime/Reference.cpp
View file

@ -97,7 +97,7 @@ Value Reference::get_value(GlobalObject& global_object) const
}
// 13.5.1.2 Runtime Semantics: Evaluation, https://tc39.es/ecma262/#sec-delete-operator-runtime-semantics-evaluation
bool Reference::delete_(GlobalObject& global_object)
ThrowCompletionOr<bool> Reference::delete_(GlobalObject& global_object)
{
// 13.5.1.2 Runtime Semantics: Evaluation, https://tc39.es/ecma262/#sec-delete-operator-runtime-semantics-evaluation
// UnaryExpression : delete UnaryExpression
@ -123,22 +123,18 @@ bool Reference::delete_(GlobalObject& global_object)
VERIFY(!is_private_reference());
// b. If IsSuperReference(ref) is true, throw a ReferenceError exception.
if (is_super_reference()) {
vm.throw_exception<ReferenceError>(global_object, ErrorType::UnsupportedDeleteSuperProperty);
return {};
}
if (is_super_reference())
return vm.throw_completion<ReferenceError>(global_object, ErrorType::UnsupportedDeleteSuperProperty);
// c. Let baseObj be ! ToObject(ref.[[Base]]).
auto* base_obj = MUST(m_base_value.to_object(global_object));
// d. Let deleteStatus be ? baseObj.[[Delete]](ref.[[ReferencedName]]).
bool delete_status = TRY_OR_DISCARD(base_obj->internal_delete(m_name));
bool delete_status = TRY(base_obj->internal_delete(m_name));
// e. If deleteStatus is false and ref.[[Strict]] is true, throw a TypeError exception.
if (!delete_status && m_strict) {
vm.throw_exception<TypeError>(global_object, ErrorType::ReferenceNullishDeleteProperty, m_name, m_base_value.to_string_without_side_effects());
return {};
}
if (!delete_status && m_strict)
return vm.throw_completion<TypeError>(global_object, ErrorType::ReferenceNullishDeleteProperty, m_name, m_base_value.to_string_without_side_effects());
// f. Return deleteStatus.
return delete_status;
@ -151,7 +147,7 @@ bool Reference::delete_(GlobalObject& global_object)
VERIFY(m_base_type == BaseType::Environment);
// c. Return ? base.DeleteBinding(ref.[[ReferencedName]]).
return TRY_OR_DISCARD(m_base_environment->delete_binding(global_object, m_name.as_string()));
return m_base_environment->delete_binding(global_object, m_name.as_string());
}
String Reference::to_string() const

2
Userland/Libraries/LibJS/Runtime/Reference.h
View file

@ -131,7 +131,7 @@ public:
void put_value(GlobalObject&, Value);
Value get_value(GlobalObject&) const;
bool delete_(GlobalObject&);
ThrowCompletionOr<bool> delete_(GlobalObject&);
String to_string() const;