diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-10 16:12:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-10 16:12:29 +0100 |
| commit | 08243d26d22ad44a857d02c90071578577b8a55d (patch) | |
| tree | af209d8ff3b3ec6d755acb9a113584d44f50c747 /src/evalfunc.c | |
| parent | 03c60c1573cdbebbb662863cfc1780d19d511db5 (diff) | |
| download | vim-git-08243d26d22ad44a857d02c90071578577b8a55d.tar.gz | |
patch 8.0.0167: str2nr()/str2float() fail with negative valuesv8.0.0167
Problem: str2nr() and str2float() do not always work with negative values.
Solution: Be more flexible about handling signs. (LemonBoy, closes #1332)
Add more tests.
Diffstat (limited to 'src/evalfunc.c')
| -rw-r--r-- | src/evalfunc.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 74676c206..efa07b111 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -11066,10 +11066,13 @@ f_sqrt(typval_T *argvars, typval_T *rettv) f_str2float(typval_T *argvars, typval_T *rettv) { char_u *p = skipwhite(get_tv_string(&argvars[0])); + int isneg = (*p == '-'); - if (*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 *rettv) 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 *rettv) } 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 *rettv) 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 |