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

LibJS: Add spreading in object literals

Browse source 
Supports spreading strings, arrays, and other objects within object
literals.
This commit is contained in:
mattco98 2020-04-27 21:52:47 -07:00 • committed by Andreas Kling
parent 3cc31ff3f3
commit 104969a9f5
4 changed files with 116 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibJS/Parser.cpp
View file

@ -446,6 +446,8 @@ NonnullRefPtr<ObjectExpression> Parser::parse_object_expression()
RefPtr<Expression> property_key;
RefPtr<Expression> property_value;
auto need_colon = true;
auto is_spread = false;
if (match_identifier_name()) {
auto identifier = consume().value();
property_key = create_ast_node<StringLiteral>(identifier);
@ -459,6 +461,12 @@ NonnullRefPtr<ObjectExpression> Parser::parse_object_expression()
consume(TokenType::BracketOpen);
property_key = parse_expression(0);
consume(TokenType::BracketClose);
} else if (match(TokenType::TripleDot)) {
consume(TokenType::TripleDot);
property_key = create_ast_node<SpreadExpression>(parse_expression(0));
property_value = property_key;
need_colon = false;
is_spread = true;
} else {
m_parser_state.m_has_errors = true;
auto& current_token = m_parser_state.m_current_token;
@ -476,6 +484,8 @@ NonnullRefPtr<ObjectExpression> Parser::parse_object_expression()
}
auto property = create_ast_node<ObjectProperty>(*property_key, *property_value);
properties.append(property);
if (is_spread)
property->set_is_spread();
if (!match(TokenType::Comma))
break;