changeset 32603:f762d8bfda84 v9.0.1633

patch 9.0.1633: duplicate code for converting float to string Commit: https://github.com/vim/vim/commit/19dfa276c37dcf657922c6f9b48cf2954191e8b6 Author: zeertzjq <zeertzjq@outlook.com> Date: Thu Jun 15 10:56:41 2023 +0100 patch 9.0.1633: duplicate code for converting float to string Problem: Duplicate code for converting float to string. Solution: Use tv_get_string(). (closes https://github.com/vim/vim/issues/12521)
author Bram Moolenaar <Bram@vim.org>
date Thu, 15 Jun 2023 12:00:06 +0200
parents b5163b60636b
children 4aa26e3e6c7f
files src/eval.c src/version.c
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -570,8 +570,7 @@ skip_expr_concatenate(
 
 /*
  * Convert "tv" to a string.
- * When "convert" is TRUE convert a List into a sequence of lines and convert
- * a Float to a String.
+ * When "convert" is TRUE convert a List into a sequence of lines.
  * Returns an allocated string (NULL when out of memory).
  */
     char_u *
@@ -579,7 +578,6 @@ typval2string(typval_T *tv, int convert)
 {
     garray_T	ga;
     char_u	*retval;
-    char_u	numbuf[NUMBUFLEN];
 
     if (convert && tv->v_type == VAR_LIST)
     {
@@ -593,11 +591,6 @@ typval2string(typval_T *tv, int convert)
 	ga_append(&ga, NUL);
 	retval = (char_u *)ga.ga_data;
     }
-    else if (convert && tv->v_type == VAR_FLOAT)
-    {
-	vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv->vval.v_float);
-	retval = vim_strsave(numbuf);
-    }
     else
 	retval = vim_strsave(tv_get_string(tv));
     return retval;
@@ -606,8 +599,7 @@ typval2string(typval_T *tv, int convert)
 /*
  * Top level evaluation function, returning a string.  Does not handle line
  * breaks.
- * When "convert" is TRUE convert a List into a sequence of lines and convert
- * a Float to a String.
+ * When "convert" is TRUE convert a List into a sequence of lines.
  * Return pointer to allocated memory, or NULL for failure.
  */
     char_u *
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1633,
+/**/
     1632,
 /**/
     1631,