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

patch 8.2.3810: Vim9: expr4 test fails on MS-Windows

Browse Source 
Problem:    Vim9: expr4 test fails on MS-Windows.
Solution:   Do not give an error for a missing function name when skipping.
This commit is contained in:
Bram Moolenaar 2021-12-14 18:57:45 +00:00
parent 7509ad8b0f
commit b334137acf
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@ -2001,7 +2001,7 @@ eval_func(
// Need to make a copy, in case evaluating the arguments makes // Need to make a copy, in case evaluating the arguments makes
// the name invalid. // the name invalid.
s = vim_strsave(s); s = vim_strsave(s);
if (s == NULL || *s == NUL || (flags & EVAL_CONSTANT)) if (s == NULL || (evaluate && (*s == NUL || (flags & EVAL_CONSTANT))))
ret = FAIL; ret = FAIL;
else else
{ {

12
src/testdir/test_vim9_expr.vim
View File

@ -646,8 +646,16 @@ def Test_expr4_equal()
assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_is', [123])) assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_is', [123]))
assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [999])) assert_equal(false, function('g:Test_expr4_equal', [123]) == function('g:Test_expr4_equal', [999]))
# TODO: this unexpectedly sometimes fails on Appveyor if true
if !has('win32') var OneFunc: func
var TwoFunc: func
OneFunc = function('len')
TwoFunc = function('len')
assert_equal(true, OneFunc('abc') == TwoFunc('123'))
endif
# check this doesn't fail when skipped
if false
var OneFunc: func var OneFunc: func
var TwoFunc: func var TwoFunc: func
OneFunc = function('len') OneFunc = function('len')

2
src/version.c
View File

@ -749,6 +749,8 @@ 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 */
/**/
3810,
/**/ /**/
3809, 3809,
/**/ /**/