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

LibJS: Allow reserved words as keys in object expressions.

Browse source
This commit is contained in:
Stephan Unverwerth 2020-04-18 20:31:27 +02:00 • committed by Andreas Kling
parent 0345fdcb77
commit bf5b251684
5 changed files with 61 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Libraries/LibJS/Parser.cpp
View file

@ -437,8 +437,8 @@ NonnullRefPtr<ObjectExpression> Parser::parse_object_expression()
while (!done() && !match(TokenType::CurlyClose)) {
FlyString property_name;
if (match(TokenType::Identifier)) {
property_name = consume(TokenType::Identifier).value();
if (match_identifier_name()) {
property_name = consume().value();
} else if (match(TokenType::StringLiteral)) {
property_name = consume(TokenType::StringLiteral).string_value();
} else if (match(TokenType::NumericLiteral)) {
@ -582,7 +582,9 @@ NonnullRefPtr<Expression> Parser::parse_secondary_expression(NonnullRefPtr<Expre
return create_ast_node<AssignmentExpression>(AssignmentOp::Assignment, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::Period:
consume();
return create_ast_node<MemberExpression>(move(lhs), parse_expression(min_precedence, associativity));
if (!match_identifier_name())
expected("IdentifierName");
return create_ast_node<MemberExpression>(move(lhs), create_ast_node<Identifier>(consume().value()));
case TokenType::BracketOpen: {
consume(TokenType::BracketOpen);
auto expression = create_ast_node<MemberExpression>(move(lhs), parse_expression(0), true);
@ -1072,6 +1074,11 @@ bool Parser::match_statement() const
|| type == TokenType::Var;
}
bool Parser::match_identifier_name() const
{
return m_parser_state.m_current_token.is_identifier_name();
}
bool Parser::done() const
{
return match(TokenType::Eof);