Mercurial > vim
diff src/evalfunc.c @ 10555:fff45421182b v8.0.0167
patch 8.0.0167: str2nr()/str2float() fail with negative values
commit https://github.com/vim/vim/commit/08243d26d22ad44a857d02c90071578577b8a55d
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 10 16:12:29 2017 +0100
patch 8.0.0167: str2nr()/str2float() fail with negative values
Problem: str2nr() and str2float() do not always work with negative values.
Solution: Be more flexible about handling signs. (LemonBoy, closes https://github.com/vim/vim/issues/1332)
Add more tests.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 10 Jan 2017 16:15:04 +0100 |
| parents | f83b6a0b6148 |
| children | 82c2c450dad0 |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -11066,10 +11066,13 @@ f_sqrt(typval_T *argvars, typval_T *rett f_str2float(typval_T *argvars, typval_T *rettv) { char_u *p = skipwhite(get_tv_string(&argvars[0])); - - if (*p == '+') + int isneg = (*p == '-'); + + if (*p == '+' || *p == '-') p = skipwhite(p + 1); (void)string2float(p, &rettv->vval.v_float); + if (isneg) + rettv->vval.v_float *= -1; rettv->v_type = VAR_FLOAT; } #endif @@ -11084,6 +11087,7 @@ f_str2nr(typval_T *argvars, typval_T *re char_u *p; varnumber_T n; int what; + int isneg; if (argvars[1].v_type != VAR_UNKNOWN) { @@ -11096,7 +11100,8 @@ f_str2nr(typval_T *argvars, typval_T *re } p = skipwhite(get_tv_string(&argvars[0])); - if (*p == '+') + isneg = (*p == '-'); + if (*p == '+' || *p == '-') p = skipwhite(p + 1); switch (base) { @@ -11106,7 +11111,11 @@ f_str2nr(typval_T *argvars, typval_T *re default: what = 0; } vim_str2nr(p, NULL, NULL, what, &n, NULL, 0); - rettv->vval.v_number = n; + if (isneg) + rettv->vval.v_number = -n; + else + rettv->vval.v_number = n; + } #ifdef HAVE_STRFTIME