diff options
| author | =?UTF-8?q?Dundar=20G=C3=B6c?= <gocdundar@gmail.com> | 2022-02-26 11:46:13 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-26 11:46:13 +0000 |
| commit | e41c1dd8890d3f701253255993f4e9af2d12225c (patch) | |
| tree | f1494998cfabbd084e7e5bf063d1aa53eae37176 | |
| parent | 4df5b33f206210fec2a0297aea27e7db8b5173c0 (diff) | |
| download | vim-git-e41c1dd8890d3f701253255993f4e9af2d12225c.tar.gz | |
patch 8.2.4476: operator name spelled wrongv8.2.4476
Problem: Operator name spelled wrong.
Solution: Change trinary to ternary. (Goc Dundar, closes #9850)
| -rw-r--r-- | src/testdir/test_expr.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_expr.vim | 6 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim index 7a998bc30..40c1701df 100644 --- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -43,7 +43,7 @@ func Test_version() call assert_false(has('patch-9.9.1')) endfunc -func Test_op_trinary() +func Test_op_ternary() let lines =<< trim END call assert_equal('yes', 1 ? 'yes' : 'no') call assert_equal('no', 0 ? 'yes' : 'no') diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index c4e520bed..f9cb62cb0 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -12,7 +12,7 @@ def FuncTwo(arg: number): number enddef " test cond ? expr : expr -def Test_expr1_trinary() +def Test_expr1_ternary() var lines =<< trim END assert_equal('one', true ? 'one' : 'two') assert_equal('one', 1 ? @@ -74,7 +74,7 @@ def Test_expr1_trinary() v9.CheckDefAndScriptFailure(lines, ['E1001: Variable not found: FuncOne', 'E121: Undefined variable: FuncTwo']) enddef -def Test_expr1_trinary_vimscript() +def Test_expr1_ternary_vimscript() # check line continuation var lines =<< trim END var name = 1 @@ -170,7 +170,7 @@ def Test_expr1_trinary_vimscript() v9.CheckDefAndScriptSuccess(lines) enddef -func Test_expr1_trinary_fails() +func Test_expr1_ternary_fails() call v9.CheckDefAndScriptFailure(["var x = 1 ? 'one'"], "Missing ':' after '?'", 1) let msg = "White space required before and after '?'" diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index 3cd42d01c..f497498ba 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -7475,7 +7475,7 @@ func Test_typed_script_var() endfunc " Test for issue6776 {{{1 -func Test_trinary_expression() +func Test_ternary_expression() try call eval('0 ? 0') catch diff --git a/src/version.c b/src/version.c index 8842ecca8..2fa8e72f1 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 */ /**/ + 4476, +/**/ 4475, /**/ 4474, |