YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicated private identifier lookup (#4947)

Browse Source 
This patch fixes #4921.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik robert.fancsik@h-lab.eu
This commit is contained in:
Robert Fancsik
2022-01-18 13:22:45 +01:00
committed by GitHub
parent 85c798705a
commit 79fd540ec9
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-expr.c
+17 -12
View File
@@ -638,16 +638,21 @@ parser_parse_class_body (parser_context_t *context_p, /**< context */
continue; continue;
} }
if (is_private) bool is_constructor_literal = false;
{
parser_check_duplicated_private_field (context_p, SCANNER_PRIVATE_FIELD_PROPERTY_GETTER_SETTER);
}
bool is_constructor_literal = context_p->token.type == LEXER_LITERAL && parser_is_constructor_literal (context_p); if (context_p->token.type == LEXER_LITERAL)
if (is_private && is_constructor_literal && lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN))
{ {
parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR); is_constructor_literal = parser_is_constructor_literal (context_p);
if (is_private)
{
if (is_constructor_literal && lexer_check_next_character (context_p, LIT_CHAR_LEFT_PAREN))
{
parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR);
}
parser_check_duplicated_private_field (context_p, SCANNER_PRIVATE_FIELD_PROPERTY_GETTER_SETTER);
}
} }
if (!is_static && is_constructor_literal) if (!is_static && is_constructor_literal)
@@ -809,9 +814,9 @@ parser_parse_class_body (parser_context_t *context_p, /**< context */
lexer_expect_object_literal_id (context_p, ident_opts); lexer_expect_object_literal_id (context_p, ident_opts);
} }
if (is_private) if (is_private && context_p->token.type == LEXER_LITERAL)
{ {
if (context_p->token.type == LEXER_LITERAL && parser_is_constructor_literal (context_p)) if (parser_is_constructor_literal (context_p))
{ {
parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR); parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR);
} }
@@ -836,9 +841,9 @@ parser_parse_class_body (parser_context_t *context_p, /**< context */
status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD; status_flags |= PARSER_IS_GENERATOR_FUNCTION | PARSER_DISALLOW_AWAIT_YIELD;
if (is_private) if (is_private && context_p->token.type == LEXER_LITERAL)
{ {
if (context_p->token.type == LEXER_LITERAL && parser_is_constructor_literal (context_p)) if (parser_is_constructor_literal (context_p))
{ {
parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR); parser_raise_error (context_p, PARSER_ERR_CLASS_PRIVATE_CONSTRUCTOR);
} }
tests/jerry/es.next/private_fields.js
+7
View File
@@ -47,6 +47,13 @@ check_syntax_error("class A { static get #a(){}; set #a(){}; #a; }");
check_syntax_error("class A { static #a(){}; #a; }"); check_syntax_error("class A { static #a(){}; #a; }");
check_syntax_error("class A extends B{ foo(){ super.#a }}"); check_syntax_error("class A extends B{ foo(){ super.#a }}");
check_syntax_error("class A extends function() { x = this.#foo; }{ #foo; };"); check_syntax_error("class A extends function() { x = this.#foo; }{ #foo; };");
check_syntax_error("class A { static async *#bar(x) { } #bar }");
check_syntax_error("class A { static async #bar(x) { } #bar }");
check_syntax_error("class A { static *#bar(x) { } #bar }");
check_syntax_error("class A { async *#bar(x) { } #bar }");
check_syntax_error("class A { async #bar(x) { } #bar }");
check_syntax_error("class A { *#bar(x) { } #bar }");
class A { class A {
#a = 1; #a = 1;