From aeb8431aff6943e460c153791faf275b01662b22 Mon Sep 17 00:00:00 2001 From: Robert Fancsik Date: Tue, 26 Nov 2019 13:07:28 +0100 Subject: [PATCH] Fix the scanning of default array/object literals. (#3367) Scanning should continue with `SCAN_MODE_POST_PRIMARY_EXPRESSION` in all cases. Fixes #3360. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu --- jerry-core/parser/js/js-scanner.c | 5 ----- tests/jerry/es2015/regression-test-issue-3360.js | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 tests/jerry/es2015/regression-test-issue-3360.js diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c index f3b73922d..ae0d3d73a 100644 --- a/jerry-core/parser/js/js-scanner.c +++ b/jerry-core/parser/js/js-scanner.c @@ -1163,11 +1163,6 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context * } scanner_context_p->mode = SCAN_MODE_POST_PRIMARY_EXPRESSION; - - if (context_p->stack_top_uint8 == SCAN_STACK_FUNCTION_PARAMETERS) - { - scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END; - } return SCAN_KEEP_TOKEN; } diff --git a/tests/jerry/es2015/regression-test-issue-3360.js b/tests/jerry/es2015/regression-test-issue-3360.js new file mode 100644 index 000000000..bea34b894 --- /dev/null +++ b/tests/jerry/es2015/regression-test-issue-3360.js @@ -0,0 +1,16 @@ +// 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. + +function $ (b = [ ].$) { }; +assert ($() === undefined);