0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 8.2.1204: Vim9: true and false not recognized in Vim9 script

Problem:    Vim9: true and false not recognized in Vim9 script.
Solution:   Recognize true and false.
This commit is contained in:
Bram Moolenaar
2020-07-13 21:59:33 +02:00
parent 3ac9c4701a
commit 5d2eb0fff0
3 changed files with 31 additions and 2 deletions

View File

@@ -3079,8 +3079,22 @@ eval7(
else if (flags & EVAL_CONSTANT)
ret = FAIL;
else if (evaluate)
// get value of variable
ret = eval_variable(s, len, rettv, NULL, TRUE, FALSE);
{
// get the value of "true", "false" or a variable
if (len == 4 && in_vim9script() && STRNCMP(s, "true", 4) == 0)
{
rettv->v_type = VAR_BOOL;
rettv->vval.v_number = VVAL_TRUE;
}
else if (len == 5 && in_vim9script()
&& STRNCMP(s, "false", 4) == 0)
{
rettv->v_type = VAR_BOOL;
rettv->vval.v_number = VVAL_FALSE;
}
else
ret = eval_variable(s, len, rettv, NULL, TRUE, FALSE);
}
else
{
// skip the name

View File

@@ -1024,6 +1024,19 @@ def Test_expr7_special()
call CheckDefFailure(['v:none = 22'], 'E46:')
enddef
def Test_expr7_special_vim9script()
let lines =<< trim END
vim9script
let t = true
let f = false
assert_equal(v:true, true)
assert_equal(true, t)
assert_equal(v:false, false)
assert_equal(false, f)
END
CheckScriptSuccess(lines)
enddef
def Test_expr7_list()
" list
assert_equal(g:list_empty, [])

View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1204,
/**/
1203,
/**/