RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-13 22:17:36 +00:00
Code Issues Activity Actions

LibJS: Allow class methods named "get", "set" or "static"

Browse source
This commit is contained in:
davidot 2021-07-25 11:50:12 +02:00 • committed by Linus Groh
parent b16c02d6b4
commit be3b4a68d2
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibJS/Parser.cpp
View file

@ -721,7 +721,23 @@ NonnullRefPtr<ClassExpression> Parser::parse_class_expression(bool expect_class_
// It is a Syntax Error if PropName of MethodDefinition is "prototype". // It is a Syntax Error if PropName of MethodDefinition is "prototype".
if (is_static && name == "prototype"sv) if (is_static && name == "prototype"sv)
syntax_error("Classes may not have a static property named 'prototype'"); syntax_error("Classes may not have a static property named 'prototype'");
} else if (match(TokenType::ParenOpen) && (is_static || method_kind != ClassMethod::Kind::Method)) {
switch (method_kind) {
case ClassMethod::Kind::Method:
VERIFY(is_static);
name = "static";
is_static = false;
break;
case ClassMethod::Kind::Getter:
name = "get";
method_kind = ClassMethod::Kind::Method;
break;
case ClassMethod::Kind::Setter:
name = "set";
method_kind = ClassMethod::Kind::Method;
break;
}
property_key = create_ast_node<StringLiteral>({ m_state.current_token.filename(), rule_start.position(), position() }, name);
} else { } else {
expected("property key"); expected("property key");
} }
@ -741,7 +757,7 @@ NonnullRefPtr<ClassExpression> Parser::parse_class_expression(bool expect_class_
if (match(TokenType::ParenOpen)) { if (match(TokenType::ParenOpen)) {
u8 parse_options = FunctionNodeParseOptions::AllowSuperPropertyLookup; u8 parse_options = FunctionNodeParseOptions::AllowSuperPropertyLookup;
if (!super_class.is_null()) if (!super_class.is_null() && !is_static && is_constructor)
parse_options |= FunctionNodeParseOptions::AllowSuperConstructorCall; parse_options |= FunctionNodeParseOptions::AllowSuperConstructorCall;
if (method_kind == ClassMethod::Kind::Getter) if (method_kind == ClassMethod::Kind::Getter)
parse_options |= FunctionNodeParseOptions::IsGetterFunction; parse_options |= FunctionNodeParseOptions::IsGetterFunction;