diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-13 21:59:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-13 21:59:33 +0200 |
| commit | 5d2eb0fff0fbe905da2c57fd73f7f127a73d1c99 (patch) | |
| tree | 8e6d2f9c474df1b157244d7431556e95401edff9 | |
| parent | 3ac9c4701a5f1e39303ca2885956db92215966db (diff) | |
| download | vim-git-5d2eb0fff0fbe905da2c57fd73f7f127a73d1c99.tar.gz | |
patch 8.2.1204: Vim9: true and false not recognized in Vim9 scriptv8.2.1204
Problem: Vim9: true and false not recognized in Vim9 script.
Solution: Recognize true and false.
| -rw-r--r-- | src/eval.c | 18 | ||||
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c index 14c2849e8..c52415130 100644 --- a/src/eval.c +++ b/src/eval.c @@ -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 diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index ede464e51..cba41e395 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -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, []) diff --git a/src/version.c b/src/version.c index fa57356e3..49896f7ff 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1204, +/**/ 1203, /**/ 1202, |