thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3187: Vim9: popup timer callback is not compiled

Browse Source 
Problem:    Vim9: popup timer callback is not compiled.
Solution:   Compile the callback when creating the timer.
This commit is contained in:
Bram Moolenaar
2021-07-19 22:19:29 +02:00
parent 605793500b
commit 9bb0dad0d8
4 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/vim9compile.c
View File

@@ -3670,6 +3670,47 @@ compile_lambda(char_u **arg, cctx_T *cctx)
return FAIL;
}
/*
* Get a lambda and compile it. Uses Vim9 syntax.
*/
int
get_lambda_tv_and_compile(
char_u **arg,
typval_T *rettv,
int types_optional,
evalarg_T *evalarg)
{
int r;
ufunc_T *ufunc;
int save_sc_version = current_sctx.sc_version;
// Get the funcref in "rettv".
current_sctx.sc_version = SCRIPT_VERSION_VIM9;
r = get_lambda_tv(arg, rettv, types_optional, evalarg);
current_sctx.sc_version = save_sc_version;
if (r != OK)
return r;
// "rettv" will now be a partial referencing the function.
ufunc = rettv->vval.v_partial->pt_func;
// Compile it here to get the return type. The return type is optional,
// when it's missing use t_unknown. This is recognized in
// compile_return().
if (ufunc->uf_ret_type == NULL || ufunc->uf_ret_type->tt_type == VAR_VOID)
ufunc->uf_ret_type = &t_unknown;
compile_def_function(ufunc, FALSE, CT_NONE, NULL);
if (ufunc->uf_def_status == UF_COMPILED)
{
// The return type will now be known.
set_function_type(ufunc);
return OK;
}
clear_tv(rettv);
return FAIL;
}
/*
* parse a dict: {key: val, [key]: val}
* "*arg" points to the '{'.