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

patch 9.0.2044: Vim9: exceptions confuse defered functions

Browse Source 
Problem:  Vim9: exceptions confuse defered functions
Solution: save and restore exception state when calling defered
          functions

closes: #13364
closes: #13372

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-10-18 11:47:37 +02:00
committed by Christian Brabandt
parent 5036e69852
commit 0672595fd5
5 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/userfunc.c
View File

@@ -6251,8 +6251,23 @@ handle_defer_one(funccall_T *funccal)
char_u *name = dr->dr_name;
dr->dr_name = NULL;
// If the deferred function is called after an exception, then only the
// first statement in the function will be executed. Save and restore
// the try/catch/throw exception state.
int save_trylevel = trylevel;
int save_did_throw = did_throw;
int save_need_rethrow = need_rethrow;
trylevel = 0;
did_throw = FALSE;
need_rethrow = FALSE;
call_func(name, -1, &rettv, dr->dr_argcount, dr->dr_argvars, &funcexe);
trylevel = save_trylevel;
did_throw = save_did_throw;
need_rethrow = save_need_rethrow;
clear_tv(&rettv);
vim_free(name);
for (int i = dr->dr_argcount - 1; i >= 0; --i)