fixed lexical scope of 'this' with eval (github issue #192)
This commit is contained in:
parent
26fdf659e3
commit
c4cdd61a3e
1 changed files with 7 additions and 6 deletions
13
quickjs.c
13
quickjs.c
|
@ -29993,12 +29993,13 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
|
|||
is_arg_scope = (scope_idx == ARG_SCOPE_END);
|
||||
if (!is_arg_scope) {
|
||||
/* add unscoped variables */
|
||||
/* XXX: propagate is_const and var_kind too ? */
|
||||
for(i = 0; i < fd->arg_count; i++) {
|
||||
vd = &fd->args[i];
|
||||
if (vd->var_name != JS_ATOM_NULL) {
|
||||
get_closure_var(ctx, s, fd,
|
||||
TRUE, i, vd->var_name, FALSE, FALSE,
|
||||
JS_VAR_NORMAL);
|
||||
TRUE, i, vd->var_name, FALSE,
|
||||
vd->is_lexical, JS_VAR_NORMAL);
|
||||
}
|
||||
}
|
||||
for(i = 0; i < fd->var_count; i++) {
|
||||
|
@ -30008,8 +30009,8 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
|
|||
vd->var_name != JS_ATOM__ret_ &&
|
||||
vd->var_name != JS_ATOM_NULL) {
|
||||
get_closure_var(ctx, s, fd,
|
||||
FALSE, i, vd->var_name, FALSE, FALSE,
|
||||
JS_VAR_NORMAL);
|
||||
FALSE, i, vd->var_name, FALSE,
|
||||
vd->is_lexical, JS_VAR_NORMAL);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
@ -30018,8 +30019,8 @@ static void add_eval_variables(JSContext *ctx, JSFunctionDef *s)
|
|||
/* do not close top level last result */
|
||||
if (vd->scope_level == 0 && is_var_in_arg_scope(vd)) {
|
||||
get_closure_var(ctx, s, fd,
|
||||
FALSE, i, vd->var_name, FALSE, FALSE,
|
||||
JS_VAR_NORMAL);
|
||||
FALSE, i, vd->var_name, FALSE,
|
||||
vd->is_lexical, JS_VAR_NORMAL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue