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

LibJS: Add function call spreading

Browse source 
Adds support for the following syntax:

    myFunction(...x, ...[1, 2, 3], ...o.foo, ...'abcd')
This commit is contained in:
Matthew Olsson 2020-05-05 22:36:24 -07:00 • committed by Andreas Kling
parent 8fe821fae2
commit 107ca2e4ba
4 changed files with 72 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Libraries/LibJS/AST.cpp
View file

@ -137,12 +137,28 @@ Value CallExpression::execute(Interpreter& interpreter) const
arguments.values().append(function.bound_arguments());
for (size_t i = 0; i < m_arguments.size(); ++i) {
auto value = m_arguments[i].execute(interpreter);
if (interpreter.exception())
return {};
arguments.append(value);
auto value = m_arguments[i].value->execute(interpreter);
if (interpreter.exception())
return {};
if (m_arguments[i].is_spread) {
// FIXME: Support generic iterables
Vector<Value> iterables;
if (value.is_string()) {
for (auto ch : value.as_string().string())
iterables.append(Value(js_string(interpreter, String::format("%c", ch))));
} else if (value.is_object() && value.as_object().is_array()) {
iterables = static_cast<const Array&>(value.as_object()).elements();
} else if (value.is_object() && value.as_object().is_string_object()) {
for (auto ch : static_cast<const StringObject&>(value.as_object()).primitive_string().string())
iterables.append(Value(js_string(interpreter, String::format("%c", ch))));
} else {
interpreter.throw_exception<TypeError>(String::format("%s is not iterable", value.to_string()));
}
for (auto& value : iterables)
arguments.append(value);
} else {
arguments.append(value);
}
}
auto& call_frame = interpreter.push_call_frame();
@ -657,7 +673,7 @@ void CallExpression::dump(int indent) const
printf("CallExpression %s\n", is_new_expression() ? "[new]" : "");
m_callee->dump(indent + 1);
for (auto& argument : m_arguments)
argument.dump(indent + 1);
argument.value->dump(indent + 1);
}
void StringLiteral::dump(int indent) const