mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.0121: filter() and map() on blob don't work

Browse Source 
Problem:    filter() and map() on blob don't work.
Solution:   Correct the code. (closes vim/vim#5483)
49c57ce500
This commit is contained in:
Sean Dewar
2020-11-25 18:56:30 +00:00
parent 726b255288
commit ef76238548
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/eval.c
View File

@@ -6449,7 +6449,8 @@ void filter_map(typval_T *argvars, typval_T *rettv, int map)
for (int i = 0; i < b->bv_ga.ga_len; i++) { for (int i = 0; i < b->bv_ga.ga_len; i++) {
typval_T tv; typval_T tv;
tv.v_type = VAR_NUMBER; tv.v_type = VAR_NUMBER;
tv.vval.v_number = tv_blob_get(b, i); const varnumber_T val = tv_blob_get(b, i);
tv.vval.v_number = val;
vimvars[VV_KEY].vv_nr = idx; vimvars[VV_KEY].vv_nr = idx;
if (filter_map_one(&tv, expr, map, &rem) == FAIL || did_emsg) { if (filter_map_one(&tv, expr, map, &rem) == FAIL || did_emsg) {
break; break;
@@ -6458,14 +6459,17 @@ void filter_map(typval_T *argvars, typval_T *rettv, int map)
EMSG(_(e_invalblob)); EMSG(_(e_invalblob));
return; return;
} }
tv.v_type = VAR_NUMBER; if (map) {
tv_blob_set(b, i, tv.vval.v_number); if (tv.vval.v_number != val) {
if (!map && rem) { tv_blob_set(b, i, tv.vval.v_number);
}
} else if (rem) {
char_u *const p = (char_u *)argvars[0].vval.v_blob->bv_ga.ga_data; char_u *const p = (char_u *)argvars[0].vval.v_blob->bv_ga.ga_data;
memmove(p + idx, p + i + 1, (size_t)b->bv_ga.ga_len - i - 1); memmove(p + i, p + i + 1, (size_t)b->bv_ga.ga_len - i - 1);
b->bv_ga.ga_len--; b->bv_ga.ga_len--;
i--; i--;
} }
idx++;
} }
} else { } else {
assert(argvars[0].v_type == VAR_LIST); assert(argvars[0].v_type == VAR_LIST);

18
src/nvim/testdir/test_blob.vim
View File

@@ -260,18 +260,22 @@ endfunc
" filter() item in blob " filter() item in blob
func Test_blob_filter() func Test_blob_filter()
let b = 0zDEADBEEF call assert_equal(0z, filter(0zDEADBEEF, '0'))
call filter(b, 'v:val != 0xEF') call assert_equal(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE'))
call assert_equal(0zDEADBE, b) call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE'))
call assert_equal(0zDEADBE, filter(0zDEADBEEF, 'v:val != 0xEF'))
call assert_equal(0zDEADBEEF, filter(0zDEADBEEF, '1'))
call assert_equal(0z01030103, filter(0z010203010203, 'v:val != 0x02'))
call assert_equal(0zADEF, filter(0zDEADBEEF, 'v:key % 2'))
endfunc endfunc
" map() item in blob " map() item in blob
func Test_blob_map() func Test_blob_map()
let b = 0zDEADBEEF call assert_equal(0zDFAEBFF0, map(0zDEADBEEF, 'v:val + 1'))
call map(b, 'v:val + 1') call assert_equal(0z00010203, map(0zDEADBEEF, 'v:key'))
call assert_equal(0zDFAEBFF0, b) call assert_equal(0zDEAEC0F2, map(0zDEADBEEF, 'v:key + v:val'))
call assert_fails("call map(b, '[9]')", 'E978:') call assert_fails("call map(0z00, '[9]')", 'E978:')
endfunc endfunc
func Test_blob_index() func Test_blob_index()