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

vim-patch:7.4.755

Browse Source 
Problem:    It is not easy to count the number of characters.
Solution:   Add the skipcc argument to strchars(). (Hirohito Higashi, Ken
            Takata)

641e48c224
This commit is contained in:
Jurica Bradaric
2016-01-30 17:42:22 +01:00
committed by Justin M. Keyes
parent 31aa060bca
commit a9a25fda42
4 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nvim/eval.c
View File

@@ -3045,12 +3045,13 @@ static int do_lock_var(lval_T *lp, char_u *name_end, int deep, int lock)
li = li->li_next;
++lp->ll_n1;
}
} else if (lp->ll_list != NULL)
/* (un)lock a List item. */
} else if (lp->ll_list != NULL) {
// (un)lock a List item.
item_lock(&lp->ll_li->li_tv, deep, lock);
else
/* un(lock) a Dictionary item. */
} else {
// (un)lock a Dictionary item.
item_lock(&lp->ll_di->di_tv, deep, lock);
}
return ret;
}
@@ -7337,7 +7338,7 @@ static struct fst {
{ "sqrt", 1, 1, f_sqrt },
{ "str2float", 1, 1, f_str2float },
{ "str2nr", 1, 2, f_str2nr },
{ "strchars", 1, 1, f_strchars },
{ "strchars", 1, 2, f_strchars },
{ "strdisplaywidth", 1, 2, f_strdisplaywidth },
{ "strftime", 1, 2, f_strftime },
{ "stridx", 2, 3, f_stridx },
@@ -16213,13 +16214,23 @@ static void f_strlen(typval_T *argvars, typval_T *rettv)
static void f_strchars(typval_T *argvars, typval_T *rettv)
{
char_u *s = get_tv_string(&argvars[0]);
int skipcc = 0;
varnumber_T len = 0;
int (*func_mb_ptr2char_adv)(char_u **pp);
while (*s != NUL) {
mb_cptr2char_adv(&s);
++len;
if (argvars[1].v_type != VAR_UNKNOWN) {
skipcc = get_tv_number_chk(&argvars[1], NULL);
}
if (skipcc < 0 || skipcc > 1) {
EMSG(_(e_invarg));
} else {
func_mb_ptr2char_adv = skipcc ? mb_ptr2char_adv : mb_cptr2char_adv;
while (*s != NUL) {
func_mb_ptr2char_adv(&s);
++len;
}
rettv->vval.v_number = len;
}
rettv->vval.v_number = len;
}
/*