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

Fix RegExp character class compilation on unicode ranges.

Browse Source 
JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó
2017-07-18 15:42:33 +02:00
committed by yichoi
parent 5fd98fa2be
commit 0ef9b8e027
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/regexp/re-parser.c
+14 -4
View File
@@ -419,8 +419,13 @@ re_parse_char_class (re_parser_ctx_t *parser_ctx_p, /**< number of classes */
} }
parser_ctx_p->input_curr_p += 2; parser_ctx_p->input_curr_p += 2;
append_char_class (re_ctx_p, code_unit, code_unit); if (is_range == false && lit_utf8_peek_next (parser_ctx_p->input_curr_p) == LIT_CHAR_MINUS)
ch = LIT_CHAR_UNDEF; {
start = code_unit;
continue;
}
ch = code_unit;
} }
else if (ch == LIT_CHAR_LOWERCASE_U) else if (ch == LIT_CHAR_LOWERCASE_U)
{ {
@@ -432,8 +437,13 @@ re_parse_char_class (re_parser_ctx_t *parser_ctx_p, /**< number of classes */
} }
parser_ctx_p->input_curr_p += 4; parser_ctx_p->input_curr_p += 4;
append_char_class (re_ctx_p, code_unit, code_unit); if (is_range == false && lit_utf8_peek_next (parser_ctx_p->input_curr_p) == LIT_CHAR_MINUS)
ch = LIT_CHAR_UNDEF; {
start = code_unit;
continue;
}
ch = code_unit;
} }
else if (ch == LIT_CHAR_LOWERCASE_D) else if (ch == LIT_CHAR_LOWERCASE_D)
{ {
tests/jerry/regexp-character-class.js
+18
View File
@@ -111,3 +111,21 @@ catch (e)
{ {
assert (e instanceof SyntaxError); assert (e instanceof SyntaxError);
} }
r = new RegExp ("^[\\u0061-\\u007a]+$").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");
r = new RegExp ("^[\\u0061-\\u007a]+").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");
r = new RegExp ("[\\u0061-\\u007a]+$").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");
r = new RegExp ("^[\\x61-\\x7a]+$").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");
r = new RegExp ("^[\\x61-\\x7a]+").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");
r = new RegExp ("[\\x61-\\x7a]+$").exec("abcdefghjklmnopqrstuvwxyz");
assert (r == "abcdefghjklmnopqrstuvwxyz");