aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 9.0.2172: Vim9: compiling :defer may fail

Browse Source 
Problem:  Vim9: compiling :defer may fail
Solution: compile defer, when ctx_skip is not SKIP_YES

compiling defer fails in an if statement with false condition,
so check the ctx_skip value when compiling :defer

fixes:  #13698
closes: #13702

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan 2023-12-16 14:36:08 +01:00 committed by Christian Brabandt
parent 535e8f5941
commit a185a31fc0
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/testdir/test_vim9_script.vim
View File

@ -4783,6 +4783,19 @@ def Test_multidefer_with_exception()
v9.CheckSourceSuccess(lines) v9.CheckSourceSuccess(lines)
enddef enddef
" Test for using ":defer" inside an if statement with a false condition
def Test_defer_skipped()
var lines =<< trim END
def Foo()
if false
defer execute('echow "hello"', "")
endif
enddef
defcompile
END
v9.CheckSourceSuccess(lines)
enddef
" Keep this last, it messes up highlighting. " Keep this last, it messes up highlighting.
def Test_substitute_cmd() def Test_substitute_cmd()
new new

2
src/version.c
View File

@ -705,7 +705,7 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/ /**/
2171, 2172,
/**/ /**/
2170, 2170,
/**/ /**/

42
src/vim9cmds.c
View File

@ -2020,11 +2020,14 @@ compile_defer(char_u *arg_start, cctx_T *cctx)
*paren = '('; *paren = '(';
// check for function type // check for function type
type = get_type_on_stack(cctx, 0); if (cctx->ctx_skip != SKIP_YES)
if (type->tt_type != VAR_FUNC)
{ {
emsg(_(e_function_name_required)); type = get_type_on_stack(cctx, 0);
return NULL; if (type->tt_type != VAR_FUNC)
{
emsg(_(e_function_name_required));
return NULL;
}
} }
// compile the arguments // compile the arguments
@ -2032,24 +2035,27 @@ compile_defer(char_u *arg_start, cctx_T *cctx)
if (compile_arguments(&arg, cctx, &argcount, CA_NOT_SPECIAL) == FAIL) if (compile_arguments(&arg, cctx, &argcount, CA_NOT_SPECIAL) == FAIL)
return NULL; return NULL;
if (func_idx >= 0) if (cctx->ctx_skip != SKIP_YES)
{ {
type2_T *argtypes = NULL; if (func_idx >= 0)
type2_T shuffled_argtypes[MAX_FUNC_ARGS]; {
type2_T *argtypes = NULL;
type2_T shuffled_argtypes[MAX_FUNC_ARGS];
if (check_internal_func_args(cctx, func_idx, argcount, FALSE, if (check_internal_func_args(cctx, func_idx, argcount, FALSE,
&argtypes, shuffled_argtypes) == FAIL) &argtypes, shuffled_argtypes) == FAIL)
return NULL;
}
else if (check_func_args_from_type(cctx, type, argcount, TRUE,
arg_start) == FAIL)
return NULL;
defer_var_idx = get_defer_var_idx(cctx);
if (defer_var_idx == 0)
return NULL;
if (generate_DEFER(cctx, defer_var_idx - 1, argcount) == FAIL)
return NULL; return NULL;
} }
else if (check_func_args_from_type(cctx, type, argcount, TRUE,
arg_start) == FAIL)
return NULL;
defer_var_idx = get_defer_var_idx(cctx);
if (defer_var_idx == 0)
return NULL;
if (generate_DEFER(cctx, defer_var_idx - 1, argcount) == FAIL)
return NULL;
return skipwhite(arg); return skipwhite(arg);
} }