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

Fix lexical scoping between scripts (#3558)

Browse Source 
This change fixes the handling of lexical blocks when executing multiple
scripts, and also fixes a few issues with module environments.

After this change, all script files will run in the same context and
will have access to lexically scoped global variables of previous
scripts, and module environments will no longer have a bound global
'this' value.

The REPL implementation in main-unix is also fixed to correctly handle
lexically scoped variables.

Fixes #3561.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai
2020-02-21 13:30:48 +01:00
committed by GitHub
parent b0a575b049
commit 68909fc5de
22 changed files with 416 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jerry-main/main-unix.c
+22 -11
View File
@@ -889,33 +889,44 @@ main (int argc,
}
/* Evaluate the line */
jerry_value_t ret_val_eval = jerry_eval (buffer, len, JERRY_PARSE_NO_OPTS);
jerry_value_t ret_val = jerry_parse (NULL,
0,
buffer,
len,
JERRY_PARSE_NO_OPTS);
if (!jerry_value_is_error (ret_val_eval))
if (!jerry_value_is_error (ret_val))
{
jerry_value_t func_val = ret_val;
ret_val = jerry_run (func_val);
jerry_release_value (func_val);
}
if (!jerry_value_is_error (ret_val))
{
/* Print return value */
const jerry_value_t args[] = { ret_val_eval };
const jerry_value_t args[] = { ret_val };
jerry_value_t ret_val_print = jerryx_handler_print (jerry_create_undefined (),
jerry_create_undefined (),
args,
1);
jerry_release_value (ret_val_print);
jerry_release_value (ret_val_eval);
ret_val_eval = jerry_run_all_enqueued_jobs ();
jerry_release_value (ret_val);
ret_val = jerry_run_all_enqueued_jobs ();
if (jerry_value_is_error (ret_val_eval))
if (jerry_value_is_error (ret_val))
{
ret_val_eval = jerry_get_value_from_error (ret_val_eval, true);
print_unhandled_exception (ret_val_eval);
ret_val = jerry_get_value_from_error (ret_val, true);
print_unhandled_exception (ret_val);
}
}
else
{
ret_val_eval = jerry_get_value_from_error (ret_val_eval, true);
print_unhandled_exception (ret_val_eval);
ret_val = jerry_get_value_from_error (ret_val, true);
print_unhandled_exception (ret_val);
}
jerry_release_value (ret_val_eval);
jerry_release_value (ret_val);
}
}
}