archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Support nested destructuring patterns in catch header (#3488)

Browse Source 
This patch fixes #3433.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik 2020-01-13 11:39:07 +01:00 committed by Dániel Bátyai
parent 1725e014b8
commit d0e8629342
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jerry-core/parser/js/js-parser-statm.c
View File

@ -1922,14 +1922,14 @@ parser_parse_try_statement_end (parser_context_t *context_p) /**< context */
#endif /* ENABLED (JERRY_ES2015) */
lexer_next_token (context_p);
#ifndef JERRY_NDEBUG
JERRY_ASSERT (block_found);
#endif /* !JERRY_NDEBUG */
#if ENABLED (JERRY_ES2015)
}
#endif /* ENABLED (JERRY_ES2015) */
#ifndef JERRY_NDEBUG
JERRY_ASSERT (block_found);
#endif /* !JERRY_NDEBUG */
if (context_p->token.type != LEXER_RIGHT_PAREN)
{
parser_raise_error (context_p, PARSER_ERR_RIGHT_PAREN_EXPECTED);

4
jerry-core/parser/js/js-scanner.c
View File

@ -829,10 +829,8 @@ scanner_scan_primary_expression_end (parser_context_t *context_p, /**< context *
lexer_next_token (context_p);
if (binding_type == SCANNER_BINDING_CATCH)
if (binding_type == SCANNER_BINDING_CATCH && context_p->stack_top_uint8 == SCAN_STACK_CATCH_STATEMENT)
{
JERRY_ASSERT (context_p->stack_top_uint8 == SCAN_STACK_CATCH_STATEMENT);
scanner_pop_binding_list (scanner_context_p);
if (context_p->token.type != LEXER_RIGHT_PAREN)

16
tests/jerry/es2015/try-pattern.js
View File

@ -71,3 +71,19 @@ try {
} catch (e) {
assert(e instanceof ReferenceError)
}
try {
throw [{a : 5}];
} catch([{a}]) {
assert(a === 5);
}
var catchReached = false;
try {
throw [{}];
assert(false);
} catch([{}]) {
catchReached = true;
}
assert(catchReached);