mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

unittests: Test tv_list_copy

Browse Source 
Also found some bugs:

1. var_item_copy() always fails to copy v:_null_list and v:_null_dict. Fixing
   this should mean fixing `deepcopy(v:_null_list)` which should’ve been, but
   was not listed in #4615. This also fixes `deepcopy(v:_null_dict)`.
2. var_item_copy() crashes when trying to copy NULL string with `conv != NULL`.
3. `conv` argument is ignored when copying list unless `deep` is true, but it
   was not reflected in documentation.
4. `tv_dict_item_alloc_len()` allocated more memory then needed.
5. typvalt2lua was not able to handle self-referencing containers.
This commit is contained in:
ZyX
2016-09-17 22:06:11 +03:00
parent 9b8beaff02
commit 9898f36aa3
3 changed files with 190 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/eval.c
View File

@@ -19024,7 +19024,7 @@ bool valid_varname(const char *varname)
/// list[1]`) var_item_copy with zero copyID will emit
/// a copy with (`copy[0] isnot copy[1]`), with non-zero it
/// will emit a copy with (`copy[0] is copy[1]`) like in the
/// original list. Not use when deep is false.
/// original list. Not used when deep is false.
int var_item_copy(const vimconv_T *const conv,
typval_T *const from,
typval_T *const to,
@@ -19050,7 +19050,8 @@ int var_item_copy(const vimconv_T *const conv,
tv_copy(from, to);
break;
case VAR_STRING:
if (conv == NULL || conv->vc_type == CONV_NONE) {
if (conv == NULL || conv->vc_type == CONV_NONE
|| from->vval.v_string == NULL) {
tv_copy(from, to);
} else {
to->v_type = VAR_STRING;
@@ -19075,8 +19076,9 @@ int var_item_copy(const vimconv_T *const conv,
} else {
to->vval.v_list = tv_list_copy(conv, from->vval.v_list, deep, copyID);
}
if (to->vval.v_list == NULL)
if (to->vval.v_list == NULL && from->vval.v_list != NULL) {
ret = FAIL;
}
break;
case VAR_DICT:
to->v_type = VAR_DICT;
@@ -19090,8 +19092,9 @@ int var_item_copy(const vimconv_T *const conv,
} else {
to->vval.v_dict = tv_dict_copy(conv, from->vval.v_dict, deep, copyID);
}
if (to->vval.v_dict == NULL)
if (to->vval.v_dict == NULL && from->vval.v_dict != NULL) {
ret = FAIL;
}
break;
case VAR_UNKNOWN:
EMSG2(_(e_intern2), "var_item_copy(UNKNOWN)");

1
src/nvim/eval/typval.c
View File

@@ -424,6 +424,7 @@ void tv_list_append_number(list_T *const l, const varnumber_T n)
/// Make a copy of list
///
/// @param[in] conv If non-NULL, then all internal strings will be converted.
/// Only used when `deep` is true.
/// @param[in] orig Original list to copy.
/// @param[in] deep If false, then shallow copy will be done.
/// @param[in] copyID See var_item_copy().

183
test/unit/eval/typval_spec.lua
View File

@@ -3,17 +3,21 @@ local eval_helpers = require('test.unit.eval.helpers')
local itp = helpers.gen_itp(it)
local OK = helpers.OK
local eq = helpers.eq
local neq = helpers.neq
local ffi = helpers.ffi
local cimport = helpers.cimport
local to_cstr = helpers.to_cstr
local alloc_log_new = helpers.alloc_log_new
local a = eval_helpers.alloc_logging_helpers
local list = eval_helpers.list
local lst2tbl = eval_helpers.lst2tbl
local type_key = eval_helpers.type_key
local li_alloc = eval_helpers.li_alloc
local int_type = eval_helpers.int_type
local first_di = eval_helpers.first_di
local dict_type = eval_helpers.dict_type
local list_type = eval_helpers.list_type
local null_list = eval_helpers.null_list
@@ -22,7 +26,8 @@ local lua2typvalt = eval_helpers.lua2typvalt
local typvalt2lua = eval_helpers.typvalt2lua
local null_string = eval_helpers.null_string
local lib = cimport('./src/nvim/eval/typval.h', './src/nvim/memory.h')
local lib = cimport('./src/nvim/eval/typval.h', './src/nvim/memory.h',
'./src/nvim/mbyte.h')
local function list_items(l)
local lis = {}
@@ -62,6 +67,30 @@ before_each(function()
alloc_log:before_each()
end)
local function clear_tmp_allocs()
local toremove = {}
local allocs = {}
for i, v in ipairs(alloc_log.log) do
if v.func == 'malloc' or v.func == 'calloc' then
allocs[tostring(v.ret)] = i
elseif v.func == 'realloc' or v.func == 'free' then
if allocs[tostring(v.args[1])] then
toremove[#toremove + 1] = allocs[tostring(v.args[1])]
if v.func == 'free' then
toremove[#toremove + 1] = i
end
end
if v.func == 'realloc' then
allocs[tostring(v.ret)] = i
end
end
end
table.sort(toremove)
for i = #toremove,1,-1 do
table.remove(alloc_log.log, toremove[i])
end
end
after_each(function()
alloc_log:after_each()
end)
@@ -566,5 +595,157 @@ describe('typval.c', function()
end)
end)
end)
describe('copy()', function()
local function tv_list_copy(...)
return ffi.gc(lib.tv_list_copy(...), lib.tv_list_unref)
end
itp('copies NULL correctly', function()
eq(nil, lib.tv_list_copy(nil, nil, true, 0))
eq(nil, lib.tv_list_copy(nil, nil, false, 0))
eq(nil, lib.tv_list_copy(nil, nil, true, 1))
eq(nil, lib.tv_list_copy(nil, nil, false, 1))
end)
itp('copies list correctly without converting items', function()
local v = {{['«']='»'}, {'„'}, 1, '“', null_string, null_list, null_dict}
local l_tv = lua2typvalt(v)
local l = l_tv.vval.v_list
local lis = list_items(l)
alloc_log:clear()
eq(1, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(1, lis[2].li_tv.vval.v_list.lv_refcount)
local l_copy1 = tv_list_copy(nil, l, false, 0)
eq(2, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(2, lis[2].li_tv.vval.v_list.lv_refcount)
local lis_copy1 = list_items(l_copy1)
eq(lis[1].li_tv.vval.v_dict, lis_copy1[1].li_tv.vval.v_dict)
eq(lis[2].li_tv.vval.v_list, lis_copy1[2].li_tv.vval.v_list)
eq(v, lst2tbl(l_copy1))
alloc_log:check({
a.list(l_copy1),
a.li(lis_copy1[1]),
a.li(lis_copy1[2]),
a.li(lis_copy1[3]),
a.li(lis_copy1[4]),
a.str(lis_copy1[4].li_tv.vval.v_string, #v[4]),
a.li(lis_copy1[5]),
a.li(lis_copy1[6]),
a.li(lis_copy1[7]),
})
lib.tv_list_free(ffi.gc(l_copy1, nil))
alloc_log:clear()
eq(1, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(1, lis[2].li_tv.vval.v_list.lv_refcount)
local l_deepcopy1 = tv_list_copy(nil, l, true, 0)
neq(nil, l_deepcopy1)
eq(1, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(1, lis[2].li_tv.vval.v_list.lv_refcount)
local lis_deepcopy1 = list_items(l_deepcopy1)
neq(lis[1].li_tv.vval.v_dict, lis_deepcopy1[1].li_tv.vval.v_dict)
neq(lis[2].li_tv.vval.v_list, lis_deepcopy1[2].li_tv.vval.v_list)
eq(v, lst2tbl(l_deepcopy1))
local di_deepcopy1 = first_di(lis_deepcopy1[1].li_tv.vval.v_dict)
alloc_log:check({
a.list(l_deepcopy1),
a.li(lis_deepcopy1[1]),
a.dict(lis_deepcopy1[1].li_tv.vval.v_dict),
a.di(di_deepcopy1, #('«')),
a.str(di_deepcopy1.di_tv.vval.v_string, #v[1]['«']),
a.li(lis_deepcopy1[2]),
a.list(lis_deepcopy1[2].li_tv.vval.v_list),
a.li(lis_deepcopy1[2].li_tv.vval.v_list.lv_first),
a.str(lis_deepcopy1[2].li_tv.vval.v_list.lv_first.li_tv.vval.v_string, #v[2][1]),
a.li(lis_deepcopy1[3]),
a.li(lis_deepcopy1[4]),
a.str(lis_deepcopy1[4].li_tv.vval.v_string, #v[4]),
a.li(lis_deepcopy1[5]),
a.li(lis_deepcopy1[6]),
a.li(lis_deepcopy1[7]),
})
end)
itp('copies list correctly and converts items', function()
local vc = ffi.gc(ffi.new('vimconv_T[1]'), function(vc)
lib.convert_setup(vc, nil, nil)
end)
-- UTF-8 ↔ latin1 conversions need no iconv
eq(OK, lib.convert_setup(vc, to_cstr('utf-8'), to_cstr('latin1')))
local v = {{['«']='»'}, {'„'}, 1, '“', null_string, null_list, null_dict}
local l_tv = lua2typvalt(v)
local l = l_tv.vval.v_list
local lis = list_items(l)
alloc_log:clear()
eq(1, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(1, lis[2].li_tv.vval.v_list.lv_refcount)
local l_deepcopy1 = tv_list_copy(vc, l, true, 0)
neq(nil, l_deepcopy1)
eq(1, lis[1].li_tv.vval.v_dict.dv_refcount)
eq(1, lis[2].li_tv.vval.v_list.lv_refcount)
local lis_deepcopy1 = list_items(l_deepcopy1)
neq(lis[1].li_tv.vval.v_dict, lis_deepcopy1[1].li_tv.vval.v_dict)
neq(lis[2].li_tv.vval.v_list, lis_deepcopy1[2].li_tv.vval.v_list)
eq({{['\171']='\187'}, {'\191'}, 1, '\191', null_string, null_list, null_dict},
lst2tbl(l_deepcopy1))
local di_deepcopy1 = first_di(lis_deepcopy1[1].li_tv.vval.v_dict)
clear_tmp_allocs()
alloc_log:check({
a.list(l_deepcopy1),
a.li(lis_deepcopy1[1]),
a.dict(lis_deepcopy1[1].li_tv.vval.v_dict),
a.di(di_deepcopy1, 1),
a.str(di_deepcopy1.di_tv.vval.v_string, 2),
a.li(lis_deepcopy1[2]),
a.list(lis_deepcopy1[2].li_tv.vval.v_list),
a.li(lis_deepcopy1[2].li_tv.vval.v_list.lv_first),
a.str(lis_deepcopy1[2].li_tv.vval.v_list.lv_first.li_tv.vval.v_string, #v[2][1]),
a.li(lis_deepcopy1[3]),
a.li(lis_deepcopy1[4]),
a.str(lis_deepcopy1[4].li_tv.vval.v_string, #v[4]),
a.li(lis_deepcopy1[5]),
a.li(lis_deepcopy1[6]),
a.li(lis_deepcopy1[7]),
})
end)
itp('returns different/same containers with(out) copyID', function()
local l_inner_tv = lua2typvalt({[type_key]=list_type})
local l_tv = lua2typvalt({l_inner_tv, l_inner_tv})
eq(3, l_inner_tv.vval.v_list.lv_refcount)
local l = l_tv.vval.v_list
eq(l.lv_first.li_tv.vval.v_list, l.lv_last.li_tv.vval.v_list)
local l_copy1 = tv_list_copy(nil, l, true, 0)
neq(l_copy1.lv_first.li_tv.vval.v_list, l_copy1.lv_last.li_tv.vval.v_list)
eq({{[type_key]=list_type}, {[type_key]=list_type}}, lst2tbl(l_copy1))
local l_copy2 = tv_list_copy(nil, l, true, 2)
eq(l_copy2.lv_first.li_tv.vval.v_list, l_copy2.lv_last.li_tv.vval.v_list)
eq({{[type_key]=list_type}, {[type_key]=list_type}}, lst2tbl(l_copy2))
eq(3, l_inner_tv.vval.v_list.lv_refcount)
end)
itp('works with self-referencing list with copyID', function()
local l_tv = lua2typvalt({[type_key]=list_type})
local l = l_tv.vval.v_list
eq(1, l.lv_refcount)
lib.tv_list_append_list(l, l)
eq(2, l.lv_refcount)
local l_copy1 = tv_list_copy(nil, l, true, 2)
eq(2, l_copy1.lv_refcount)
local v = {}
v[1] = v
eq(v, lst2tbl(l_copy1))
local lis = list_items(l)
lib.tv_list_item_remove(l, lis[1])
eq(1, l.lv_refcount)
local lis_copy1 = list_items(l_copy1)
lib.tv_list_item_remove(l_copy1, lis_copy1[1])
eq(1, l_copy1.lv_refcount)
end)
end)
end)
end)