mirror of
https://github.com/neovim/neovim.git
synced 2025-09-14 07:18:17 +00:00
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.
This commit is contained in:
@@ -15453,7 +15453,7 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
|
|||||||
; li != NULL;) {
|
; li != NULL;) {
|
||||||
listitem_T *const prev_li = TV_LIST_ITEM_PREV(l, li);
|
listitem_T *const prev_li = TV_LIST_ITEM_PREV(l, li);
|
||||||
if (item_compare_func_ptr(&prev_li, &li) == 0) {
|
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"));
|
EMSG(_("E882: Uniq compare function failed"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@@ -8,6 +8,7 @@ local meths = helpers.meths
|
|||||||
local funcs = helpers.funcs
|
local funcs = helpers.funcs
|
||||||
local command = helpers.command
|
local command = helpers.command
|
||||||
local exc_exec = helpers.exc_exec
|
local exc_exec = helpers.exc_exec
|
||||||
|
local redir_exec = helpers.redir_exec
|
||||||
|
|
||||||
before_each(clear)
|
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]',
|
eq('[-1.0e-4, function(\'tr\'), v:true, v:false, v:null, [], {\'a\': 42}, \'check\', 1.0e-4]',
|
||||||
eval('string(g:list)'))
|
eval('string(g:list)'))
|
||||||
end)
|
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)
|
end)
|
||||||
|
34
test/functional/eval/uniq_spec.lua
Normal file
34
test/functional/eval/uniq_spec.lua
Normal file
@@ -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)
|
Reference in New Issue
Block a user