fries/quickjs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed lexical scope of 'this' with eval (github issue #192)

Browse source
This commit is contained in:
Fabrice Bellard 2023-12-09 12:27:39 +01:00 committed by Ben Noordhuis
parent f1b7b6da71
commit 30e4767e67
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
quickjs.c
View file

@ -28382,12 +28382,13 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
is_arg_scope = (scope_idx == ARG_SCOPE_END); is_arg_scope = (scope_idx == ARG_SCOPE_END);
if (!is_arg_scope) { if (!is_arg_scope) {
/* add unscoped variables */ /* add unscoped variables */
/* XXX: propagate is_const and var_kind too ? */
for(i = 0; i < fd->arg_count; i++) { for(i = 0; i < fd->arg_count; i++) {
vd = &fd->args[i]; vd = &fd->args[i];
if (vd->var_name != JS_ATOM_NULL) { if (vd->var_name != JS_ATOM_NULL) {
get_closure_var(ctx, s, fd, get_closure_var(ctx, s, fd,
TRUE, i, vd->var_name, FALSE, FALSE, TRUE, i, vd->var_name, FALSE,
JS_VAR_NORMAL); vd->is_lexical, JS_VAR_NORMAL);
} }
} }
for(i = 0; i < fd->var_count; i++) { for(i = 0; i < fd->var_count; i++) {
@ -28397,8 +28398,8 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
vd->var_name != JS_ATOM__ret_ && vd->var_name != JS_ATOM__ret_ &&
vd->var_name != JS_ATOM_NULL) { vd->var_name != JS_ATOM_NULL) {
get_closure_var(ctx, s, fd, get_closure_var(ctx, s, fd,
FALSE, i, vd->var_name, FALSE, FALSE, FALSE, i, vd->var_name, FALSE,
JS_VAR_NORMAL); vd->is_lexical, JS_VAR_NORMAL);
} }
} }
} else { } else {
@ -28407,8 +28408,8 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
/* do not close top level last result */ /* do not close top level last result */
if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) { if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
get_closure_var(ctx, s, fd, get_closure_var(ctx, s, fd,
FALSE, i, vd->var_name, FALSE, FALSE, FALSE, i, vd->var_name, FALSE,
JS_VAR_NORMAL); vd->is_lexical, JS_VAR_NORMAL);
} }
} }
} }