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

eval: Refactor nr2char()

Browse Source 
Adds error messages, checks type and ignores the second argument.

Currently utf_char2bytes is able to handle any 31-bit character, not
limited by a unicode range. So checking for INT_MAX and not for
something else: function yet uses `int`.
This commit is contained in:
ZyX
2017-04-16 20:16:32 +03:00
parent 3c5f4b382f
commit fbdef2e6f2
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/nvim/eval.c
View File

@@ -12763,25 +12763,32 @@ static void f_nextnonblank(typval_T *argvars, typval_T *rettv, FunPtr fptr)
*/ */
static void f_nr2char(typval_T *argvars, typval_T *rettv, FunPtr fptr) static void f_nr2char(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
char_u buf[NUMBUFLEN]; if (argvars[1].v_type != VAR_UNKNOWN) {
if (!tv_check_num(&argvars[1])) {
if (has_mbyte) { return;
int utf8 = 0;
if (argvars[1].v_type != VAR_UNKNOWN) {
utf8 = tv_get_number_chk(&argvars[1], NULL);
} }
if (utf8) {
buf[(*utf_char2bytes)((int)tv_get_number(&argvars[0]), buf)] = NUL;
} else {
buf[(*mb_char2bytes)((int)tv_get_number(&argvars[0]), buf)] = NUL;
}
} else {
buf[0] = (char_u)tv_get_number(&argvars[0]);
buf[1] = NUL;
} }
bool error = false;
const varnumber_T num = tv_get_number_chk(&argvars[0], &error);
if (error) {
return;
}
if (num < 0) {
emsgf(_("E5070: Character number could not be less then zero"));
return;
}
if (num > INT_MAX) {
emsgf(_("E5071: Character number could not be greater then INT_MAX (%i)"),
INT_MAX);
return;
}
char buf[MB_MAXBYTES];
const int len = utf_char2bytes((int)num, (char_u *)buf);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = vim_strsave(buf); rettv->vval.v_string = xmemdupz(buf, (size_t)len);
} }
/* /*