aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-13 06:54:15 -04:00
Code Activity

patch 8.1.2035: recognizing octal numbers is confusing

Browse Source 
Problem:    Recognizing octal numbers is confusing.
Solution:   Introduce scriptversion 4: do not use octal and allow for single
            quote inside numbers.
This commit is contained in:
Bram Moolenaar
2019-09-15 14:33:22 +02:00
parent 50bf7ce0c9
commit 60a8de28d1
8 changed files with 78 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/evalfunc.c
View File

@@ -728,7 +728,7 @@ static funcentry_T global_functions[] =
{"str2float", 1, 1, FEARG_1, f_str2float},
#endif
{"str2list", 1, 2, FEARG_1, f_str2list},
{"str2nr", 1, 2, FEARG_1, f_str2nr},
{"str2nr", 1, 3, FEARG_1, f_str2nr},
{"strcharpart", 2, 3, FEARG_1, f_strcharpart},
{"strchars", 1, 2, FEARG_1, f_strchars},
{"strdisplaywidth", 1, 2, FEARG_1, f_strdisplaywidth},
@@ -7323,7 +7323,7 @@ f_str2nr(typval_T *argvars, typval_T *rettv)
int base = 10;
char_u *p;
varnumber_T n;
int what;
int what = 0;
int isneg;
if (argvars[1].v_type != VAR_UNKNOWN)
@@ -7334,6 +7334,8 @@ f_str2nr(typval_T *argvars, typval_T *rettv)
emsg(_(e_invarg));
return;
}
if (argvars[2].v_type != VAR_UNKNOWN && tv_get_number(&argvars[2]))
what |= STR2NR_QUOTE;
}
p = skipwhite(tv_get_string(&argvars[0]));
@@ -7342,10 +7344,9 @@ f_str2nr(typval_T *argvars, typval_T *rettv)
p = skipwhite(p + 1);
switch (base)
{
case 2: what = STR2NR_BIN + STR2NR_FORCE; break;
case 8: what = STR2NR_OCT + STR2NR_FORCE; break;
case 16: what = STR2NR_HEX + STR2NR_FORCE; break;
default: what = 0;
case 2: what |= STR2NR_BIN + STR2NR_FORCE; break;
case 8: what |= STR2NR_OCT + STR2NR_FORCE; break;
case 16: what |= STR2NR_HEX + STR2NR_FORCE; break;
}
vim_str2nr(p, NULL, NULL, what, &n, NULL, 0, FALSE);
// Text after the number is silently ignored.