mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -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:
18
src/eval.c
18
src/eval.c
@@ -3079,8 +3079,22 @@ eval7(
|
|||||||
else if (flags & EVAL_CONSTANT)
|
else if (flags & EVAL_CONSTANT)
|
||||||
ret = FAIL;
|
ret = FAIL;
|
||||||
else if (evaluate)
|
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
|
else
|
||||||
{
|
{
|
||||||
// skip the name
|
// skip the name
|
||||||
|
@@ -1024,6 +1024,19 @@ def Test_expr7_special()
|
|||||||
call CheckDefFailure(['v:none = 22'], 'E46:')
|
call CheckDefFailure(['v:none = 22'], 'E46:')
|
||||||
enddef
|
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()
|
def Test_expr7_list()
|
||||||
" list
|
" list
|
||||||
assert_equal(g:list_empty, [])
|
assert_equal(g:list_empty, [])
|
||||||
|
@@ -754,6 +754,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 */
|
||||||
|
/**/
|
||||||
|
1204,
|
||||||
/**/
|
/**/
|
||||||
1203,
|
1203,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user