RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 02:08:11 +00:00
Code Issues Activity Actions

LibJS: Tidy up CallExpression::execute() a little bit

Browse source
This commit is contained in:
Andreas Kling 2020-10-13 19:00:37 +02:00
parent 909687ddf0
commit 9f6c5f68b6
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Libraries/LibJS/AST.cpp
View file

@ -120,7 +120,7 @@ CallExpression::ThisAndCallee CallExpression::compute_this_and_callee(Interprete
if (m_callee->is_super_expression()) { if (m_callee->is_super_expression()) {
// If we are calling super, |this| has not been initialized yet, and would not be meaningful to provide. // If we are calling super, |this| has not been initialized yet, and would not be meaningful to provide.
auto new_target = interpreter.vm().get_new_target(); auto new_target = vm.get_new_target();
ASSERT(new_target.is_function()); ASSERT(new_target.is_function());
return { js_undefined(), new_target }; return { js_undefined(), new_target };
} }
@ -128,16 +128,16 @@ CallExpression::ThisAndCallee CallExpression::compute_this_and_callee(Interprete
if (m_callee->is_member_expression()) { if (m_callee->is_member_expression()) {
auto& member_expression = static_cast<const MemberExpression&>(*m_callee); auto& member_expression = static_cast<const MemberExpression&>(*m_callee);
bool is_super_property_lookup = member_expression.object().is_super_expression(); bool is_super_property_lookup = member_expression.object().is_super_expression();
auto lookup_target = is_super_property_lookup ? interpreter.current_environment()->get_super_base() : member_expression.object().execute(interpreter, global_object); auto lookup_target = is_super_property_lookup ? vm.current_environment()->get_super_base() : member_expression.object().execute(interpreter, global_object);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (is_super_property_lookup && lookup_target.is_nullish()) { if (is_super_property_lookup && lookup_target.is_nullish()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::ObjectPrototypeNullOrUndefinedOnSuperPropertyAccess, lookup_target.to_string_without_side_effects()); vm.throw_exception<TypeError>(global_object, ErrorType::ObjectPrototypeNullOrUndefinedOnSuperPropertyAccess, lookup_target.to_string_without_side_effects());
return {}; return {};
} }
auto* this_value = is_super_property_lookup ? &vm.this_value(global_object).as_object() : lookup_target.to_object(global_object); auto* this_value = is_super_property_lookup ? &vm.this_value(global_object).as_object() : lookup_target.to_object(global_object);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
auto property_name = member_expression.computed_property_name(interpreter, global_object); auto property_name = member_expression.computed_property_name(interpreter, global_object);
if (!property_name.is_valid()) if (!property_name.is_valid())
@ -150,8 +150,9 @@ CallExpression::ThisAndCallee CallExpression::compute_this_and_callee(Interprete
Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_object) const Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_object) const
{ {
auto& vm = interpreter.vm();
auto [this_value, callee] = compute_this_and_callee(interpreter, global_object); auto [this_value, callee] = compute_this_and_callee(interpreter, global_object);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
ASSERT(!callee.is_empty()); ASSERT(!callee.is_empty());
@ -167,29 +168,30 @@ Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_obj
} else { } else {
expression_string = static_cast<const MemberExpression&>(*m_callee).to_string_approximation(); expression_string = static_cast<const MemberExpression&>(*m_callee).to_string_approximation();
} }
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::IsNotAEvaluatedFrom, callee.to_string_without_side_effects(), call_type, expression_string); vm.throw_exception<TypeError>(global_object, ErrorType::IsNotAEvaluatedFrom, callee.to_string_without_side_effects(), call_type, expression_string);
} else { } else {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::IsNotA, callee.to_string_without_side_effects(), call_type); vm.throw_exception<TypeError>(global_object, ErrorType::IsNotA, callee.to_string_without_side_effects(), call_type);
} }
return {}; return {};
} }
auto& function = callee.as_function(); auto& function = callee.as_function();
MarkedValueList arguments(interpreter.heap()); MarkedValueList arguments(vm.heap());
arguments.ensure_capacity(m_arguments.size());
for (size_t i = 0; i < m_arguments.size(); ++i) { for (size_t i = 0; i < m_arguments.size(); ++i) {
auto value = m_arguments[i].value->execute(interpreter, global_object); auto value = m_arguments[i].value->execute(interpreter, global_object);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (m_arguments[i].is_spread) { if (m_arguments[i].is_spread) {
get_iterator_values(global_object, value, [&](Value iterator_value) { get_iterator_values(global_object, value, [&](Value iterator_value) {
if (interpreter.exception()) if (vm.exception())
return IterationDecision::Break; return IterationDecision::Break;
arguments.append(iterator_value); arguments.append(iterator_value);
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
if (interpreter.exception()) if (vm.exception())
return {}; return {};
} else { } else {
arguments.append(value); arguments.append(value);
@ -199,26 +201,26 @@ Value CallExpression::execute(Interpreter& interpreter, GlobalObject& global_obj
Object* new_object = nullptr; Object* new_object = nullptr;
Value result; Value result;
if (is_new_expression()) { if (is_new_expression()) {
result = interpreter.vm().construct(function, function, move(arguments), global_object); result = vm.construct(function, function, move(arguments), global_object);
if (result.is_object()) if (result.is_object())
new_object = &result.as_object(); new_object = &result.as_object();
} else if (m_callee->is_super_expression()) { } else if (m_callee->is_super_expression()) {
auto* super_constructor = interpreter.current_environment()->current_function()->prototype(); auto* super_constructor = vm.current_environment()->current_function()->prototype();
// FIXME: Functions should track their constructor kind. // FIXME: Functions should track their constructor kind.
if (!super_constructor || !super_constructor->is_function()) { if (!super_constructor || !super_constructor->is_function()) {
interpreter.vm().throw_exception<TypeError>(global_object, ErrorType::NotAConstructor, "Super constructor"); vm.throw_exception<TypeError>(global_object, ErrorType::NotAConstructor, "Super constructor");
return {}; return {};
} }
result = interpreter.vm().construct(static_cast<Function&>(*super_constructor), function, move(arguments), global_object); result = vm.construct(static_cast<Function&>(*super_constructor), function, move(arguments), global_object);
if (interpreter.exception()) if (vm.exception())
return {}; return {};
interpreter.current_environment()->bind_this_value(global_object, result); vm.current_environment()->bind_this_value(global_object, result);
} else { } else {
result = interpreter.vm().call(function, this_value, move(arguments)); result = vm.call(function, this_value, move(arguments));
} }
if (interpreter.exception()) if (vm.exception())
return {}; return {};
if (is_new_expression()) { if (is_new_expression()) {