From 35a3df3f28ee4cdb60f662b63e8d31448004a4c3 Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Mon, 23 Sep 2019 15:38:15 +0200 Subject: [PATCH] Fix scanning of do-while statement. (#3149) The newline before the while part is misinterpreted. JerryScript-DCO-1.0-Signed-off-by: Zoltan Herczeg zherczeg.u-szeged@partner.samsung.com --- jerry-core/parser/js/js-scanner.c | 2 +- tests/jerry/do-while.js | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tests/jerry/do-while.js diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c index 663e42c2b..ce085a485 100644 --- a/jerry-core/parser/js/js-scanner.c +++ b/jerry-core/parser/js/js-scanner.c @@ -1464,7 +1464,7 @@ scanner_scan_statement_end (parser_context_t *context_p, /**< context */ parser_stack_pop_uint8 (context_p); if (type != LEXER_KEYW_WHILE - || (!terminator_found && (context_p->token.flags & LEXER_WAS_NEWLINE))) + || (!terminator_found && !(context_p->token.flags & LEXER_WAS_NEWLINE))) { scanner_raise_error (context_p); } diff --git a/tests/jerry/do-while.js b/tests/jerry/do-while.js new file mode 100644 index 000000000..5265ee601 --- /dev/null +++ b/tests/jerry/do-while.js @@ -0,0 +1,27 @@ +// 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. + +var a = 0; + +do a++ +while (false) + +do { a++ } while (false) + +try { + eval("do a++ while (false)"); + assert (false); +} catch (e) { + assert (e instanceof SyntaxError); +}