mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 06:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4529: Vim9: comparing partial with function fails

Browse Source 
Problem:    Vim9: comparing partial with function fails.
Solution:   Support this comparison.  Avoid a crash. (closes vim/vim#9909)
            Add more test cases.

ed0c62e7b1

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
Jan Edmund Lazo
2025-12-14 01:35:01 -05:00
parent ce05990823
commit 7ce17cd2a2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/eval/userfunc.c
View File

@@ -3782,13 +3782,22 @@ void make_partial(dict_T *const selfdict, typval_T *const rettv)
char fname_buf[FLEN_FIXED + 1]; char fname_buf[FLEN_FIXED + 1];
int error; int error;
if (rettv->v_type == VAR_PARTIAL && rettv->vval.v_partial->pt_func != NULL) { if (rettv->v_type == VAR_PARTIAL
&& rettv->vval.v_partial != NULL
&& rettv->vval.v_partial->pt_func != NULL) {
fp = rettv->vval.v_partial->pt_func; fp = rettv->vval.v_partial->pt_func;
} else { } else {
char *fname = rettv->v_type == VAR_FUNC || rettv->v_type == VAR_STRING char *fname = rettv->v_type == VAR_FUNC || rettv->v_type == VAR_STRING
? rettv->vval.v_string ? rettv->vval.v_string
: rettv->vval.v_partial == NULL
? NULL
: rettv->vval.v_partial->pt_name; : rettv->vval.v_partial->pt_name;
if (fname != NULL) { if (fname == NULL) {
// There is no point binding a dict to a NULL function, just create
// a function reference.
rettv->v_type = VAR_FUNC;
rettv->vval.v_string = NULL;
} else {
char *tofree = NULL; char *tofree = NULL;
// Translate "s:func" to the stored function name. // Translate "s:func" to the stored function name.
@@ -3799,8 +3808,7 @@ void make_partial(dict_T *const selfdict, typval_T *const rettv)
} }
// Turn "dict.Func" into a partial for "Func" with "dict". // Turn "dict.Func" into a partial for "Func" with "dict".
if ((fp != NULL && (fp->uf_flags & FC_DICT)) if (fp != NULL && (fp->uf_flags & FC_DICT)) {
|| (rettv->v_type == VAR_FUNC && rettv->vval.v_string == NULL)) {
partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T)); partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
pt->pt_refcount = 1; pt->pt_refcount = 1;
pt->pt_dict = selfdict; pt->pt_dict = selfdict;

3
test/old/testdir/test_vimscript.vim
View File

@@ -6569,6 +6569,9 @@ func Test_type()
call assert_false(v:true is 1) call assert_false(v:true is 1)
call assert_false(v:true is v:false) call assert_false(v:true is v:false)
" call assert_false(v:none is 0) " call assert_false(v:none is 0)
" call assert_false(v:none is [])
" call assert_false(v:none is {})
" call assert_false(v:none is 'text')
call assert_false(v:null is 0) call assert_false(v:null is 0)
" call assert_false(v:null is v:none) " call assert_false(v:null is v:none)