IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22448 from zeertzjq/vim-8.2.2780

Browse Source 
vim-patch:8.2.{2780,2782,2783}
This commit is contained in:
zeertzjq 2023-02-28 17:13:24 +08:00 committed by GitHub
commit a87b52d328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 282 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/eval.c
View File

@ -1620,18 +1620,7 @@ void set_var_lval(lval_T *lp, char *endp, typval_T *rettv, int copy, const bool
bool error = false; bool error = false;
const char val = (char)tv_get_number_chk(rettv, &error); const char val = (char)tv_get_number_chk(rettv, &error);
if (!error) { if (!error) {
garray_T *const gap = &lp->ll_blob->bv_ga; tv_blob_set_append(lp->ll_blob, (int)lp->ll_n1, (uint8_t)val);
// Allow for appending a byte. Setting a byte beyond
// the end is an error otherwise.
if (lp->ll_n1 < gap->ga_len || lp->ll_n1 == gap->ga_len) {
ga_grow(&lp->ll_blob->bv_ga, 1);
tv_blob_set(lp->ll_blob, (int)lp->ll_n1, (uint8_t)val);
if (lp->ll_n1 == gap->ga_len) {
gap->ga_len++;
}
}
// error for invalid range was already given in get_lval()
} }
} }
} else if (op != NULL && *op != '=') { } else if (op != NULL && *op != '=') {
@ -4861,7 +4850,7 @@ void filter_map(typval_T *argvars, typval_T *rettv, int map)
if (filter_map_one(&tv, expr, map, &rem) == FAIL || did_emsg) { if (filter_map_one(&tv, expr, map, &rem) == FAIL || did_emsg) {
break; break;
} }
if (tv.v_type != VAR_NUMBER) { if (tv.v_type != VAR_NUMBER && tv.v_type != VAR_BOOL) {
emsg(_(e_invalblob)); emsg(_(e_invalblob));
return; return;
} }

9
src/nvim/eval/funcs.c
View File

@ -3743,7 +3743,6 @@ static void f_inputsecret(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
/// "insert()" function /// "insert()" function
static void f_insert(typval_T *argvars, typval_T *rettv, EvalFuncData fptr) static void f_insert(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
{ {
list_T *l;
bool error = false; bool error = false;
if (argvars[0].v_type == VAR_BLOB) { if (argvars[0].v_type == VAR_BLOB) {
@ -3786,8 +3785,12 @@ static void f_insert(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
tv_copy(&argvars[0], rettv); tv_copy(&argvars[0], rettv);
} else if (argvars[0].v_type != VAR_LIST) { } else if (argvars[0].v_type != VAR_LIST) {
semsg(_(e_listblobarg), "insert()"); semsg(_(e_listblobarg), "insert()");
} else if (!value_check_lock(tv_list_locked((l = argvars[0].vval.v_list)), } else {
N_("insert() argument"), TV_TRANSLATE)) { list_T *l = argvars[0].vval.v_list;
if (value_check_lock(tv_list_locked(l), N_("insert() argument"), TV_TRANSLATE)) {
return;
}
int64_t before = 0; int64_t before = 0;
if (argvars[2].v_type != VAR_UNKNOWN) { if (argvars[2].v_type != VAR_UNKNOWN) {
before = tv_get_number_chk(&argvars[2], &error); before = tv_get_number_chk(&argvars[2], &error);

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

@ -283,33 +283,36 @@ func Test_blob_index_assign()
endfunc endfunc
func Test_blob_for_loop() func Test_blob_for_loop()
let blob = 0z00010203 let lines =<< trim END
let i = 0 VAR blob = 0z00010203
for byte in blob VAR i = 0
call assert_equal(i, byte) for byte in blob
let i += 1 call assert_equal(i, byte)
endfor LET i += 1
call assert_equal(4, i) endfor
call assert_equal(4, i)
let blob = 0z00 LET blob = 0z00
call remove(blob, 0)
call assert_equal(0, len(blob))
for byte in blob
call assert_error('loop over empty blob')
endfor
let blob = 0z0001020304
let i = 0
for byte in blob
call assert_equal(i, byte)
if i == 1
call remove(blob, 0) call remove(blob, 0)
elseif i == 3 call assert_equal(0, len(blob))
call remove(blob, 3) for byte in blob
endif call assert_report('loop over empty blob')
let i += 1 endfor
endfor
call assert_equal(5, i) LET blob = 0z0001020304
LET i = 0
for byte in blob
call assert_equal(i, byte)
if i == 1
call remove(blob, 0)
elseif i == 3
call remove(blob, 3)
endif
LET i += 1
endfor
call assert_equal(5, i)
END
call CheckLegacyAndVim9Success(lines)
endfunc endfunc
func Test_blob_concatenate() func Test_blob_concatenate()
@ -344,51 +347,101 @@ endfunc
" Test removing items in blob " Test removing items in blob
func Test_blob_func_remove() func Test_blob_func_remove()
" Test removing 1 element let lines =<< trim END
let b = 0zDEADBEEF #" Test removing 1 element
call assert_equal(0xDE, remove(b, 0)) VAR b = 0zDEADBEEF
call assert_equal(0zADBEEF, b) call assert_equal(0xDE, remove(b, 0))
call assert_equal(0zADBEEF, b)
let b = 0zDEADBEEF LET b = 0zDEADBEEF
call assert_equal(0xEF, remove(b, -1)) call assert_equal(0xEF, remove(b, -1))
call assert_equal(0zDEADBE, b) call assert_equal(0zDEADBE, b)
let b = 0zDEADBEEF LET b = 0zDEADBEEF
call assert_equal(0xAD, remove(b, 1)) call assert_equal(0xAD, remove(b, 1))
call assert_equal(0zDEBEEF, b) call assert_equal(0zDEBEEF, b)
" Test removing range of element(s) #" Test removing range of element(s)
let b = 0zDEADBEEF LET b = 0zDEADBEEF
call assert_equal(0zBE, remove(b, 2, 2)) call assert_equal(0zBE, remove(b, 2, 2))
call assert_equal(0zDEADEF, b) call assert_equal(0zDEADEF, b)
let b = 0zDEADBEEF LET b = 0zDEADBEEF
call assert_equal(0zADBE, remove(b, 1, 2)) call assert_equal(0zADBE, remove(b, 1, 2))
call assert_equal(0zDEEF, b) call assert_equal(0zDEEF, b)
END
call CheckLegacyAndVim9Success(lines)
" Test invalid cases " Test invalid cases
let b = 0zDEADBEEF let lines =<< trim END
call assert_fails("call remove(b, 5)", 'E979:') VAR b = 0zDEADBEEF
call assert_fails("call remove(b, 1, 5)", 'E979:') call remove(b, 5)
call assert_fails("call remove(b, 3, 2)", 'E979:') END
call assert_fails("call remove(1, 0)", 'E896:') call CheckLegacyAndVim9Failure(lines, 'E979:')
call assert_fails("call remove(b, b)", 'E974:')
call assert_fails("call remove(b, 1, [])", 'E745:')
call assert_fails("call remove(v:_null_blob, 1, 2)", 'E979:')
" Translated from v8.2.3284 let lines =<< trim END
let b = 0zDEADBEEF VAR b = 0zDEADBEEF
lockvar b call remove(b, 1, 5)
call assert_fails('call remove(b, 0)', 'E741:') END
unlockvar b call CheckLegacyAndVim9Failure(lines, 'E979:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call remove(b, 3, 2)
END
call CheckLegacyAndVim9Failure(lines, 'E979:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call remove(1, 0)
END
call CheckLegacyAndVim9Failure(lines, 'E896:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call remove(b, b)
END
call CheckLegacyAndVim9Failure(lines, 'E974:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call remove(b, 1, [])
END
call CheckLegacyAndVim9Failure(lines, 'E745:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call remove(v:_null_blob, 1, 2)
END
call CheckLegacyAndVim9Failure(lines, 'E979:')
let lines =<< trim END
let b = 0zDEADBEEF
lockvar b
call remove(b, 0)
unlockvar b
END
call CheckScriptFailure(lines, 'E741:')
" can only check at script level, not in a :def function
let lines =<< trim END
vim9script
var b = 0zDEADBEEF
lockvar b
remove(b, 0)
END
call CheckScriptFailure(lines, 'E741:')
endfunc endfunc
func Test_blob_read_write() func Test_blob_read_write()
let b = 0zDEADBEEF let lines =<< trim END
call writefile(b, 'Xblob') VAR b = 0zDEADBEEF
let br = readfile('Xblob', 'B') call writefile(b, 'Xblob')
call assert_equal(b, br) VAR br = readfile('Xblob', 'B')
call delete('Xblob') call assert_equal(b, br)
call delete('Xblob')
END
call CheckLegacyAndVim9Success(lines)
" This was crashing when calling readfile() with a directory. " This was crashing when calling readfile() with a directory.
call assert_fails("call readfile('.', 'B')", 'E17: "." is a directory') call assert_fails("call readfile('.', 'B')", 'E17: "." is a directory')
@ -396,85 +449,190 @@ endfunc
" filter() item in blob " filter() item in blob
func Test_blob_filter() func Test_blob_filter()
call assert_equal(v:_null_blob, filter(v:_null_blob, '0')) let lines =<< trim END
call assert_equal(0z, filter(0zDEADBEEF, '0')) call assert_equal(v:_null_blob, filter(v:_null_blob, '0'))
call assert_equal(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE')) call assert_equal(0z, filter(0zDEADBEEF, '0'))
call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE')) call assert_equal(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE'))
call assert_equal(0zDEADBE, filter(0zDEADBEEF, 'v:val != 0xEF')) call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE'))
call assert_equal(0zDEADBEEF, filter(0zDEADBEEF, '1')) call assert_equal(0zDEADBE, filter(0zDEADBEEF, 'v:val != 0xEF'))
call assert_equal(0z01030103, filter(0z010203010203, 'v:val != 0x02')) call assert_equal(0zDEADBEEF, filter(0zDEADBEEF, '1'))
call assert_equal(0zADEF, filter(0zDEADBEEF, 'v:key % 2')) call assert_equal(0z01030103, filter(0z010203010203, 'v:val != 0x02'))
call assert_equal(0zADEF, filter(0zDEADBEEF, 'v:key % 2'))
END
call CheckLegacyAndVim9Success(lines)
endfunc endfunc
" map() item in blob " map() item in blob
func Test_blob_map() func Test_blob_map()
call assert_equal(0zDFAEBFF0, map(0zDEADBEEF, 'v:val + 1')) let lines =<< trim END
call assert_equal(0z00010203, map(0zDEADBEEF, 'v:key')) call assert_equal(0zDFAEBFF0, map(0zDEADBEEF, 'v:val + 1'))
call assert_equal(0zDEAEC0F2, map(0zDEADBEEF, 'v:key + v:val')) call assert_equal(0z00010203, map(0zDEADBEEF, 'v:key'))
call assert_equal(0zDEAEC0F2, map(0zDEADBEEF, 'v:key + v:val'))
END
call CheckLegacyAndVim9Success(lines)
call assert_fails("call map(0z00, '[9]')", 'E978:') let lines =<< trim END
call map(0z00, '[9]')
END
call CheckLegacyAndVim9Failure(lines, 'E978:')
endfunc endfunc
func Test_blob_index() func Test_blob_index()
call assert_equal(2, index(0zDEADBEEF, 0xBE)) let lines =<< trim END
call assert_equal(-1, index(0zDEADBEEF, 0)) call assert_equal(2, index(0zDEADBEEF, 0xBE))
call assert_equal(2, index(0z11111111, 0x11, 2)) call assert_equal(-1, index(0zDEADBEEF, 0))
call assert_equal(3, 0z11110111->index(0x11, 2)) call assert_equal(2, index(0z11111111, 0x11, 2))
call assert_equal(2, index(0z11111111, 0x11, -2)) call assert_equal(3, 0z11110111->index(0x11, 2))
call assert_equal(3, index(0z11110111, 0x11, -2)) call assert_equal(2, index(0z11111111, 0x11, -2))
call assert_equal(0, index(0z11110111, 0x11, -10)) call assert_equal(3, index(0z11110111, 0x11, -2))
call assert_fails("echo index(0z11110111, 0x11, [])", 'E745:') call assert_equal(0, index(0z11110111, 0x11, -10))
call assert_equal(-1, index(v:_null_blob, 1)) call assert_equal(-1, index(v:_null_blob, 1))
END
call CheckLegacyAndVim9Success(lines)
call assert_fails('call index("asdf", 0)', 'E897:') let lines =<< trim END
echo index(0z11110111, 0x11, [])
END
call CheckLegacyAndVim9Failure(lines, 'E745:')
let lines =<< trim END
call index("asdf", 0)
END
call CheckLegacyAndVim9Failure(lines, 'E897:')
endfunc endfunc
func Test_blob_insert() func Test_blob_insert()
let b = 0zDEADBEEF let lines =<< trim END
call insert(b, 0x33) VAR b = 0zDEADBEEF
call assert_equal(0z33DEADBEEF, b) call insert(b, 0x33)
call assert_equal(0z33DEADBEEF, b)
let b = 0zDEADBEEF LET b = 0zDEADBEEF
call insert(b, 0x33, 2) call insert(b, 0x33, 2)
call assert_equal(0zDEAD33BEEF, b) call assert_equal(0zDEAD33BEEF, b)
END
call CheckLegacyAndVim9Success(lines)
call assert_fails('call insert(b, -1)', 'E475:') " only works in legacy script
call assert_fails('call insert(b, 257)', 'E475:')
call assert_fails('call insert(b, 0, [9])', 'E745:')
call assert_fails('call insert(b, 0, -20)', 'E475:')
call assert_fails('call insert(b, 0, 20)', 'E475:')
call assert_fails('call insert(b, [])', 'E745:')
call assert_equal(0, insert(v:_null_blob, 0x33)) call assert_equal(0, insert(v:_null_blob, 0x33))
" Translated from v8.2.3284 let lines =<< trim END
let b = 0zDEADBEEF VAR b = 0zDEADBEEF
lockvar b call insert(b, -1)
call assert_fails('call insert(b, 3)', 'E741:') END
unlockvar b call CheckLegacyAndVim9Failure(lines, 'E475:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call insert(b, 257)
END
call CheckLegacyAndVim9Failure(lines, 'E475:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call insert(b, 0, [9])
END
call CheckLegacyAndVim9Failure(lines, ['E745:', 'E1013:', 'E745:'])
let lines =<< trim END
VAR b = 0zDEADBEEF
call insert(b, 0, -20)
END
call CheckLegacyAndVim9Failure(lines, 'E475:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call insert(b, 0, 20)
END
call CheckLegacyAndVim9Failure(lines, 'E475:')
let lines =<< trim END
VAR b = 0zDEADBEEF
call insert(b, [])
END
call CheckLegacyAndVim9Failure(lines, ['E745:', 'E1013:', 'E745:'])
let lines =<< trim END
insert(v:_null_blob, 0x33)
END
call CheckDefExecAndScriptFailure(lines, 'E1131:')
let lines =<< trim END
let b = 0zDEADBEEF
lockvar b
call insert(b, 3)
unlockvar b
END
call CheckScriptFailure(lines, 'E741:')
let lines =<< trim END
vim9script
var b = 0zDEADBEEF
lockvar b
insert(b, 3)
END
call CheckScriptFailure(lines, 'E741:')
endfunc endfunc
func Test_blob_reverse() func Test_blob_reverse()
call assert_equal(0zEFBEADDE, reverse(0zDEADBEEF)) let lines =<< trim END
call assert_equal(0zBEADDE, reverse(0zDEADBE)) call assert_equal(0zEFBEADDE, reverse(0zDEADBEEF))
call assert_equal(0zADDE, reverse(0zDEAD)) call assert_equal(0zBEADDE, reverse(0zDEADBE))
call assert_equal(0zDE, reverse(0zDE)) call assert_equal(0zADDE, reverse(0zDEAD))
call assert_equal(0z, reverse(v:_null_blob)) call assert_equal(0zDE, reverse(0zDE))
call assert_equal(0z, reverse(v:_null_blob))
END
call CheckLegacyAndVim9Success(lines)
endfunc
func Test_blob_json_encode()
let lines =<< trim END
#" call assert_equal('[222,173,190,239]', json_encode(0zDEADBEEF))
call assert_equal('[222, 173, 190, 239]', json_encode(0zDEADBEEF))
call assert_equal('[]', json_encode(0z))
END
call CheckLegacyAndVim9Success(lines)
endfunc endfunc
func Test_blob_lock() func Test_blob_lock()
let b = 0z112233 let lines =<< trim END
lockvar b let b = 0z112233
call assert_fails('let b = 0z44', 'E741:') lockvar b
unlockvar b unlockvar b
let b = 0z44 let b = 0z44
END
call CheckScriptSuccess(lines)
let lines =<< trim END
vim9script
var b = 0z112233
lockvar b
unlockvar b
b = 0z44
END
call CheckScriptSuccess(lines)
let lines =<< trim END
let b = 0z112233
lockvar b
let b = 0z44
END
call CheckScriptFailure(lines, 'E741:')
let lines =<< trim END
vim9script
var b = 0z112233
lockvar b
b = 0z44
END
call CheckScriptFailure(lines, 'E741:')
endfunc endfunc
func Test_blob_sort() func Test_blob_sort()
if has('float') if has('float')
call assert_fails('call sort([1.0, 0z11], "f")', 'E975:') call CheckLegacyAndVim9Failure(['call sort([1.0, 0z11], "f")'], 'E975:')
else
call assert_fails('call sort(["abc", 0z11], "f")', 'E702:')
endif endif
call CheckLegacyAndVim9Failure(['call sort([11, 0z11], "N")'], 'E974:')
endfunc endfunc
" The following used to cause an out-of-bounds memory access " The following used to cause an out-of-bounds memory access

4
src/nvim/testdir/vim9.vim
View File

@ -34,6 +34,10 @@ func CheckScriptSuccess(lines)
endtry endtry
endfunc endfunc
func CheckDefExecAndScriptFailure(lines, error, lnum = -3)
return
endfunc
" Check that "lines" inside a legacy function has no error. " Check that "lines" inside a legacy function has no error.
func CheckLegacySuccess(lines) func CheckLegacySuccess(lines)
let cwd = getcwd() let cwd = getcwd()