From 525995fe9d2d7d7d47ed1e75364c27b4414ef8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Tokodi?= Date: Mon, 17 Jun 2024 15:14:44 +0200 Subject: [PATCH] Fix parsing class body that includes stray semicolon after a static block MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JerryScript-DCO-1.0-Signed-off-by: Máté Tokodi mate.tokodi@szteszoftver.hu --- jerry-core/parser/js/js-scanner.c | 12 ++++++------ tests/jerry/regression-test-issue-5114.js | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 tests/jerry/regression-test-issue-5114.js diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c index 9ab7942e6c..c88a8bfcda 100644 --- a/jerry-core/parser/js/js-scanner.c +++ b/jerry-core/parser/js/js-scanner.c @@ -2700,6 +2700,12 @@ scanner_scan_all (parser_context_t *context_p) /**< context */ identifier_found = true; } + if (context_p->token.type == LEXER_SEMICOLON) + { + scanner_context.mode = SCAN_MODE_CLASS_BODY; + continue; + } + if (!identifier_found) { scanner_raise_error (context_p); @@ -2728,12 +2734,6 @@ scanner_scan_all (parser_context_t *context_p) /**< context */ break; } - if (context_p->token.type == LEXER_SEMICOLON) - { - scanner_context.mode = SCAN_MODE_CLASS_BODY; - continue; - } - if (context_p->token.type != LEXER_RIGHT_BRACE && !(context_p->token.flags & LEXER_WAS_NEWLINE)) { scanner_raise_error (context_p); diff --git a/tests/jerry/regression-test-issue-5114.js b/tests/jerry/regression-test-issue-5114.js new file mode 100644 index 0000000000..412f2e708c --- /dev/null +++ b/tests/jerry/regression-test-issue-5114.js @@ -0,0 +1,19 @@ +// Copyright JS Foundation and other contributors, http://js.foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +class c { + static { + } + ; +}