diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-02-06 19:09:24 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2016-04-18 02:45:49 +0300 |
| commit | b7cb8f0597c42f209ec460a1850df53bd655c81c (patch) | |
| tree | d26023c1a50c7695b1b1cee0e5d2096adee72bcb /src | |
| parent | c91c0171dd7c72717866569be96e48bf838cdf0f (diff) | |
| download | rneovim-b7cb8f0597c42f209ec460a1850df53bd655c81c.tar.gz rneovim-b7cb8f0597c42f209ec460a1850df53bd655c81c.tar.bz2 rneovim-b7cb8f0597c42f209ec460a1850df53bd655c81c.zip | |
eval: Make assert_true and assert_false accept v:true and v:false
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 22a12d353a..63fd392a3a 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7587,16 +7587,20 @@ static void f_assert_equal(typval_T *argvars, typval_T *rettv) } // Common for assert_true() and assert_false(). -static void assert_bool(typval_T *argvars, bool isTrue) +static void assert_bool(typval_T *argvars, bool is_true) { int error = (int)false; garray_T ga; - if (argvars[0].v_type != VAR_NUMBER || - (get_tv_number_chk(&argvars[0], &error) == 0) == isTrue || error) { + if ((argvars[0].v_type != VAR_NUMBER || + (get_tv_number_chk(&argvars[0], &error) == 0) == is_true || error) + && (argvars[0].v_type != VAR_SPECIAL + || argvars[0].vval.v_special != (is_true + ?kSpecialVarTrue + :kSpecialVarFalse))) { prepare_assert_error(&ga); fill_assert_error(&ga, &argvars[1], - (char_u *)(isTrue ? "True" : "False"), + (char_u *)(is_true ? "True" : "False"), NULL, &argvars[0]); assert_error(&ga); ga_clear(&ga); |