diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2023-12-09 12:27:39 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2023-12-09 22:26:51 +0100 |
| commit | 617c29296ea9805fb715750333d5d0dcaa19878b (patch) | |
| tree | b3b0bcc58b239ead6cacd56874ce0576920cfe2b /lib/quickjs/quickjs.c | |
| parent | 4dcbf01dacb43c9d9a3b66463e8846e74b1341a4 (diff) | |
| download | chawan-617c29296ea9805fb715750333d5d0dcaa19878b.tar.gz | |
fixed lexical scope of 'this' with eval (github issue #192)
Diffstat (limited to 'lib/quickjs/quickjs.c')
| -rw-r--r-- | lib/quickjs/quickjs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/quickjs/quickjs.c b/lib/quickjs/quickjs.c index b3f0b539..3aeab77d 100644 --- a/lib/quickjs/quickjs.c +++ b/lib/quickjs/quickjs.c @@ -30203,12 +30203,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++) { @@ -30218,8 +30219,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 { @@ -30228,8 +30229,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); } } } |