aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.2434: Vim9: no error when compiling str2nr() with a number

Browse Source 
Problem:    Vim9: no error when compiling str2nr() with a number.
Solution:   Add argument type checks. (closes #7759)
This commit is contained in:
Bram Moolenaar
2021-01-30 23:05:11 +01:00
parent b63f3ca66d
commit f2b26bcf8f
5 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/typval.c
View File

@@ -388,6 +388,19 @@ tv_get_string(typval_T *varp)
return tv_get_string_buf(varp, mybuf);
}
/*
* Like tv_get_string() but don't allow number to string conversion for Vim9.
*/
char_u *
tv_get_string_strict(typval_T *varp)
{
static char_u mybuf[NUMBUFLEN];
char_u *res = tv_get_string_buf_chk_strict(
varp, mybuf, in_vim9script());
return res != NULL ? res : (char_u *)"";
}
char_u *
tv_get_string_buf(typval_T *varp, char_u *buf)
{
@@ -409,10 +422,21 @@ tv_get_string_chk(typval_T *varp)
char_u *
tv_get_string_buf_chk(typval_T *varp, char_u *buf)
{
return tv_get_string_buf_chk_strict(varp, buf, FALSE);
}
char_u *
tv_get_string_buf_chk_strict(typval_T *varp, char_u *buf, int strict)
{
switch (varp->v_type)
{
case VAR_NUMBER:
if (strict)
{
emsg(_(e_using_number_as_string));
break;
}
vim_snprintf((char *)buf, NUMBUFLEN, "%lld",
(varnumber_T)varp->vval.v_number);
return buf;