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

Object/Array initializers should be parsed as AssignmentExpression (#3851)

Browse Source 
This patch fixes #3849.

JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
Robert Fancsik 2020-06-05 13:25:05 +02:00 committed by GitHub
parent 0d4116933f
commit 1770ccaecd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jerry-core/parser/js/js-parser-expr.c
View File

@ -1581,14 +1581,14 @@ parser_check_assignment_expr (parser_context_t *context_p)
} /* parser_check_assignment_expr */
/**
* Checks whether the next token is a valid continuation token after an arrow function.
* Checks whether the next token is a valid continuation token after an AssignmentExpression.
*/
static inline bool JERRY_ATTR_ALWAYS_INLINE
parser_abort_parsing_after_arrow (parser_context_t *context_p)
parser_abort_parsing_after_assignment_expression (parser_context_t *context_p)
{
return (context_p->token.type != LEXER_RIGHT_PAREN
&& context_p->token.type != LEXER_COMMA);
} /* parser_abort_parsing_after_arrow */
} /* parser_abort_parsing_after_assignment_expression */
#endif /* ENABLED (JERRY_ES2015) */
@ -1732,7 +1732,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
parser_check_assignment_expr (context_p);
parser_parse_function_expression (context_p, arrow_status_flags);
return parser_abort_parsing_after_arrow (context_p);
return parser_abort_parsing_after_assignment_expression (context_p);
}
#endif /* ENABLED (JERRY_ES2015) */
@ -1828,7 +1828,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
if (parser_is_assignment_expr (context_p))
{
parser_parse_object_initializer (context_p, PARSER_PATTERN_NO_OPTS);
return false;
return parser_abort_parsing_after_assignment_expression (context_p);
}
scanner_release_next (context_p, sizeof (scanner_location_info_t));
@ -1848,7 +1848,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
if (parser_is_assignment_expr (context_p))
{
parser_parse_array_initializer (context_p, PARSER_PATTERN_NO_OPTS);
return false;
return parser_abort_parsing_after_assignment_expression (context_p);
}
scanner_release_next (context_p, sizeof (scanner_location_info_t));
@ -1949,7 +1949,7 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
parser_check_assignment_expr (context_p);
parser_parse_function_expression (context_p, PARSER_IS_FUNCTION | PARSER_IS_ARROW_FUNCTION);
return parser_abort_parsing_after_arrow (context_p);
return parser_abort_parsing_after_assignment_expression (context_p);
}
case LEXER_KEYW_YIELD:
{

21
tests/jerry/es2015/regression-test-issue-3849.js Normal file
View File

@ -0,0 +1,21 @@
// 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.
try {
eval(`[]=$--['']`);
assert(false);
} catch (e) {
assert(e instanceof SyntaxError);
}