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

patch 7.4.1271

Browse Source 
Problem:    assert_false(v:false) reports an error. (Nikolai Pavlov)
Solution:   Recognize v:true and v:false. (Closes #625)
This commit is contained in:
Bram Moolenaar
2016-02-06 20:29:28 +01:00
parent 81e7a9c3fb
commit 3712792637
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eval.c
View File

@@ -9216,6 +9216,9 @@ assert_bool(typval_T *argvars, int isTrue)
int error = FALSE; int error = FALSE;
garray_T ga; garray_T ga;
if (argvars[0].v_type == VAR_SPECIAL
&& argvars[0].vval.v_number == (isTrue ? VVAL_TRUE : VV_FALSE))
return;
if (argvars[0].v_type != VAR_NUMBER if (argvars[0].v_type != VAR_NUMBER
|| (get_tv_number_chk(&argvars[0], &error) == 0) == isTrue || (get_tv_number_chk(&argvars[0], &error) == 0) == isTrue
|| error) || error)

2
src/testdir/test_assert.vim
View File

@@ -2,11 +2,13 @@
func Test_assert_false() func Test_assert_false()
call assert_false(0) call assert_false(0)
call assert_false(v:false)
endfunc endfunc
func Test_assert_true() func Test_assert_true()
call assert_true(1) call assert_true(1)
call assert_true(123) call assert_true(123)
call assert_true(v:true)
endfunc endfunc
func Test_assert_equal() func Test_assert_equal()

2
src/version.c
View File

@@ -742,6 +742,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 */
/**/
1271,
/**/ /**/
1270, 1270,
/**/ /**/