patch 8.2.2434: Vim9: no error when compiling str2nr() with a number
Problem: Vim9: no error when compiling str2nr() with a number.
Solution: Add argument type checks. (closes #7759)
diff --git a/src/typval.c b/src/typval.c
index 7e4e63d..b3325b6 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -388,6 +388,19 @@
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)
{
@@ -410,9 +423,20 @@
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;