From 57336909cbcaeca18687d6e8d2d8bd4a1e97d09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Lang=C3=B3?= Date: Mon, 3 Aug 2015 14:52:56 +0200 Subject: [PATCH] Fix RegExp matching on right brackets and braces. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com --- jerry-core/parser/regexp/re-parser.cpp | 3 +-- tests/jerry/regression-test-issue-257.js | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 tests/jerry/regression-test-issue-257.js diff --git a/jerry-core/parser/regexp/re-parser.cpp b/jerry-core/parser/regexp/re-parser.cpp index af9493e7c..811c23052 100644 --- a/jerry-core/parser/regexp/re-parser.cpp +++ b/jerry-core/parser/regexp/re-parser.cpp @@ -825,10 +825,9 @@ re_parse_next_token (re_parser_ctx_t *parser_ctx_p, /**< RegExp parser context * out_token_p->type = RE_TOK_START_INV_CHAR_CLASS; lit_utf8_iterator_advance (iter_p, 1); } + break; } - case LIT_CHAR_RIGHT_SQUARE: - case LIT_CHAR_RIGHT_BRACE: case LIT_CHAR_QUESTION: case LIT_CHAR_ASTERISK: case LIT_CHAR_PLUS: diff --git a/tests/jerry/regression-test-issue-257.js b/tests/jerry/regression-test-issue-257.js new file mode 100644 index 000000000..8ca367232 --- /dev/null +++ b/tests/jerry/regression-test-issue-257.js @@ -0,0 +1,21 @@ +// Copyright 2015 Samsung Electronics Co., Ltd. +// Copyright 2015 University of Szeged. +// +// 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 r; +r = new RegExp("]"); +assert (r.exec("]") == "]"); + +r = new RegExp("}"); +assert (r.exec("}") == "}");