aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2018-04-15 18:45:12 +0300
committerZyX <kp-pav@yandex.ru>2018-04-15 18:45:12 +0300
commitf8d574225b61fc4bc0fd52990deda4825f62dc8f (patch)
treebceb3f4a230d020da93fe609b233c2e2aa7b0eba
parent6f19b9f4e19d12aea23ac61c889aa122bc2576eb (diff)
downloadrneovim-f8d574225b61fc4bc0fd52990deda4825f62dc8f.tar.gz
rneovim-f8d574225b61fc4bc0fd52990deda4825f62dc8f.tar.bz2
rneovim-f8d574225b61fc4bc0fd52990deda4825f62dc8f.zip
eval: Silence PVS/V547: E882 may be triggered
I failed to deduce why analyzer thinks E882 may not be triggered, though conditions for triggering it are strange: it would trigger E882 only in the single case “function returned non-number”. Cases “function thrown exception”, or “built-in sorter encountered error” will neither yield E882 nor stop sort()/uniq(). Note though that searching test code revealed that neither E702 nor E882 are not tested anywhere.
-rw-r--r--src/nvim/eval.c2
-rw-r--r--test/functional/eval/sort_spec.lua15
-rw-r--r--test/functional/eval/uniq_spec.lua34
3 files changed, 50 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 5281e227d6..437a9dacf6 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -15453,7 +15453,7 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
; li != NULL;) {
listitem_T *const prev_li = TV_LIST_ITEM_PREV(l, li);
if (item_compare_func_ptr(&prev_li, &li) == 0) {
- if (info.item_compare_func_err) {
+ if (info.item_compare_func_err) { // -V547
EMSG(_("E882: Uniq compare function failed"));
break;
}
diff --git a/test/functional/eval/sort_spec.lua b/test/functional/eval/sort_spec.lua
index 4e5a0afba4..82557575ce 100644
--- a/test/functional/eval/sort_spec.lua
+++ b/test/functional/eval/sort_spec.lua
@@ -8,6 +8,7 @@ local meths = helpers.meths
local funcs = helpers.funcs
local command = helpers.command
local exc_exec = helpers.exc_exec
+local redir_exec = helpers.redir_exec
before_each(clear)
@@ -38,4 +39,18 @@ describe('sort()', function()
eq('[-1.0e-4, function(\'tr\'), v:true, v:false, v:null, [], {\'a\': 42}, \'check\', 1.0e-4]',
eval('string(g:list)'))
end)
+
+ it('can yield E702 and stop sorting after that', function()
+ command([[
+ function Cmp(a, b)
+ if type(a:a) == type([]) || type(a:b) == type([])
+ return []
+ endif
+ return (a:a > a:b) - (a:a < a:b)
+ endfunction
+ ]])
+ eq('\nE745: Using a List as a Number\nE702: Sort compare function failed',
+ redir_exec('let sl = sort([1, 0, [], 3, 2], "Cmp")'))
+ eq({1, 0, {}, 3, 2}, meths.get_var('sl'))
+ end)
end)
diff --git a/test/functional/eval/uniq_spec.lua b/test/functional/eval/uniq_spec.lua
new file mode 100644
index 0000000000..5217034d81
--- /dev/null
+++ b/test/functional/eval/uniq_spec.lua
@@ -0,0 +1,34 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local NIL = helpers.NIL
+local eval = helpers.eval
+local clear = helpers.clear
+local meths = helpers.meths
+local funcs = helpers.funcs
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local redir_exec = helpers.redir_exec
+
+before_each(clear)
+
+describe('uniq()', function()
+ it('errors out when processing special values', function()
+ eq('Vim(call):E907: Using a special value as a Float',
+ exc_exec('call uniq([v:true, v:false], "f")'))
+ end)
+
+ it('can yield E882 and stop filtering after that', function()
+ command([[
+ function Cmp(a, b)
+ if type(a:a) == type([]) || type(a:b) == type([])
+ return []
+ endif
+ return (a:a > a:b) - (a:a < a:b)
+ endfunction
+ ]])
+ eq('\nE745: Using a List as a Number\nE882: Uniq compare function failed',
+ redir_exec('let fl = uniq([0, 0, [], 1, 1], "Cmp")'))
+ eq({0, {}, 1, 1}, meths.get_var('fl'))
+ end)
+end)