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

Fix await parsing in modules (#4266)

Browse Source 
Fixes #4189

JerryScript-DCO-1.0-Signed-off-by: Peter Marki marpeter@inf.u-szeged.hu
This commit is contained in:
Peter Marki
2020-11-10 09:53:00 +01:00
committed by GitHub
parent b2084e0a02
commit 25bb5083be
6 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-core/parser/js/js-parser-expr.c
+8
View File
@@ -1907,6 +1907,14 @@ parser_parse_unary_expression (parser_context_t *context_p, /**< context */
#if ENABLED (JERRY_ESNEXT)
case LEXER_KEYW_AWAIT:
{
#if ENABLED (JERRY_MODULE_SYSTEM)
if ((context_p->global_status_flags & ECMA_PARSE_MODULE)
&& !(context_p->status_flags & PARSER_IS_ASYNC_FUNCTION))
{
parser_raise_error (context_p, PARSER_ERR_AWAIT_NOT_ALLOWED);
}
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
if (JERRY_UNLIKELY (context_p->token.lit_location.has_escape))
{
parser_raise_error (context_p, PARSER_ERR_INVALID_KEYWORD);
jerry-core/parser/js/js-parser.c
+6 -6
View File
@@ -3170,12 +3170,6 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */
if (JERRY_UNLIKELY (bytecode_p == NULL))
{
#if ENABLED (JERRY_MODULE_SYSTEM)
if (JERRY_CONTEXT (module_top_context_p) != NULL)
{
ecma_module_cleanup ();
}
#endif
#if ENABLED (JERRY_DEBUGGER)
if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED)
{
@@ -3222,6 +3216,12 @@ parser_parse_script (const uint8_t *arg_list_p, /**< function argument list */
resource_name,
line_str_val,
col_str_val);
#if ENABLED (JERRY_MODULE_SYSTEM)
if (JERRY_CONTEXT (module_top_context_p) != NULL)
{
ecma_module_cleanup ();
}
#endif /* ENABLED (JERRY_MODULE_SYSTEM) */
ecma_free_value (col_str_val);
ecma_free_value (line_str_val);