aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.0703: Vim9: closure cannot store value in outer context

Browse Source 
Problem:    Vim9: closure cannot store value in outer context.
Solution:   Make storing value in outer context work.  Make :disassemble
            accept a function reference.
This commit is contained in:
Bram Moolenaar
2020-05-06 21:06:30 +02:00
parent 54ed0dff29
commit b68b346e6d
8 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vim9execute.c
View File

@@ -1070,6 +1070,14 @@ call_def_function(
*tv = *STACK_TV_BOT(0);
break;
// store variable or argument in outer scope
case ISN_STOREOUTER:
--ectx.ec_stack.ga_len;
tv = STACK_OUT_TV_VAR(iptr->isn_arg.number);
clear_tv(tv);
*tv = *STACK_TV_BOT(0);
break;
// store s: variable in old script
case ISN_STORES:
{
@@ -2133,7 +2141,7 @@ ex_disassemble(exarg_T *eap)
int is_global = FALSE;
fname = trans_function_name(&arg, &is_global, FALSE,
TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD | TFN_NO_DEREF, NULL, NULL);
TFN_INT | TFN_QUIET | TFN_NO_AUTOLOAD, NULL, NULL);
if (fname == NULL)
{
semsg(_(e_invarg2), eap->arg);
@@ -2275,12 +2283,17 @@ ex_disassemble(exarg_T *eap)
break;
case ISN_STORE:
case ISN_STOREOUTER:
{
char *add = iptr->isn_type == ISN_STORE ? "" : "OUTER";
if (iptr->isn_arg.number < 0)
smsg("%4d STORE arg[%lld]", current,
smsg("%4d STORE%s arg[%lld]", current, add,
(long long)(iptr->isn_arg.number + STACK_FRAME_SIZE));
else
smsg("%4d STORE $%lld", current,
smsg("%4d STORE%s $%lld", current, add,
(long long)(iptr->isn_arg.number));
}
break;
case ISN_STOREV:
smsg("%4d STOREV v:%s", current,