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 #23467 from zeertzjq/vim-8.2.0987

Browse Source 
vim-patch:8.2.{0987,1463}
This commit is contained in:
zeertzjq 2023-05-04 15:09:50 +08:00 committed by GitHub
commit b9e34571f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/nvim/eval.c
View File

@ -3470,7 +3470,7 @@ static int eval_index(char **arg, typval_T *rettv, evalarg_T *const evalarg, boo
bool empty1 = false;
bool empty2 = false;
ptrdiff_t len = -1;
int range = false;
bool range = false;
const char *key = NULL;
switch (rettv->v_type) {
@ -3667,45 +3667,15 @@ static int eval_index(char **arg, typval_T *rettv, evalarg_T *const evalarg, boo
}
break;
case VAR_LIST:
len = tv_list_len(rettv->vval.v_list);
if (n1 < 0) {
n1 = (int)len + n1;
if (empty1) {
n1 = 0;
}
if (!empty1 && (n1 < 0 || n1 >= len)) {
// For a range we allow invalid values and return an empty
// list. A list index out of range is an error.
if (!range) {
if (verbose) {
semsg(_(e_listidx), (int64_t)n1);
}
return FAIL;
}
n1 = (int)len;
if (empty2) {
n2 = -1;
}
if (range) {
list_T *l;
listitem_T *item;
if (n2 < 0) {
n2 = (int)len + n2;
} else if (n2 >= len) {
n2 = (int)len - 1;
}
if (!empty2 && (n2 < 0 || n2 + 1 < n1)) {
n2 = -1;
}
l = tv_list_alloc(n2 - n1 + 1);
item = tv_list_find(rettv->vval.v_list, n1);
while (n1++ <= n2) {
tv_list_append_tv(l, TV_LIST_ITEM_TV(item));
item = TV_LIST_ITEM_NEXT(rettv->vval.v_list, item);
}
tv_clear(rettv);
tv_list_set_ret(rettv, l);
} else {
tv_copy(TV_LIST_ITEM_TV(tv_list_find(rettv->vval.v_list, (int)n1)), &var1);
tv_clear(rettv);
*rettv = var1;
if (tv_list_slice_or_index(rettv->vval.v_list,
range, n1, n2, rettv, verbose) == FAIL) {
return FAIL;
}
break;
case VAR_DICT: {

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

@ -765,6 +765,61 @@ int tv_list_concat(list_T *const l1, list_T *const l2, typval_T *const tv)
return OK;
}
static list_T *tv_list_slice(list_T *ol, int n1, int n2)
{
list_T *l = tv_list_alloc(n2 - n1 + 1);
listitem_T *item = tv_list_find(ol, n1);
for (; n1 <= n2; n1++) {
tv_list_append_tv(l, TV_LIST_ITEM_TV(item));
item = TV_LIST_ITEM_NEXT(rettv->vval.v_list, item);
}
return l;
}
int tv_list_slice_or_index(list_T *list, bool range, int n1_arg, int n2_arg, typval_T *rettv,
bool verbose)
{
int len = tv_list_len(rettv->vval.v_list);
int n1 = n1_arg;
int n2 = n2_arg;
if (n1 < 0) {
n1 = len + n1;
}
if (n1 < 0 || n1 >= len) {
// For a range we allow invalid values and return an empty
// list. A list index out of range is an error.
if (!range) {
if (verbose) {
semsg(_(e_listidx), (int64_t)n1);
}
return FAIL;
}
n1 = len;
}
if (range) {
if (n2 < 0) {
n2 = len + n2;
} else if (n2 >= len) {
n2 = len - 1;
}
if (n2 < 0 || n2 + 1 < n1) {
n2 = -1;
}
list_T *l = tv_list_slice(rettv->vval.v_list, n1, n2);
tv_clear(rettv);
tv_list_set_ret(rettv, l);
} else {
// copy the item to "var1" to avoid that freeing the list makes it
// invalid.
typval_T var1;
tv_copy(TV_LIST_ITEM_TV(tv_list_find(rettv->vval.v_list, (int)n1)), &var1);
tv_clear(rettv);
*rettv = var1;
}
return OK;
}
typedef struct {
char *s;
char *tofree;