diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/charset.c | 16 | ||||
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_eval_stuff.vim | 5 | ||||
| -rw-r--r-- | src/testdir/test_functions.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 11 |
6 files changed, 32 insertions, 9 deletions
diff --git a/src/charset.c b/src/charset.c index 7415c2471..6cf4a2bb1 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1764,6 +1764,8 @@ vim_isblankline(char_u *lbuf) * If "prep" is not NULL, returns a flag to indicate the type of the number: * 0 decimal * '0' octal + * 'O' octal + * 'o' octal * 'B' bin * 'b' bin * 'X' hex @@ -1783,8 +1785,8 @@ vim_isblankline(char_u *lbuf) vim_str2nr( char_u *start, int *prep, // return: type of number 0 = decimal, 'x' - // or 'X' is hex, '0' = octal, 'b' or 'B' - // is bin + // or 'X' is hex, '0', 'o' or 'O' is octal, + // 'b' or 'B' is bin int *len, // return: detected length of number int what, // what numbers to recognize varnumber_T *nptr, // return: signed result @@ -1822,6 +1824,11 @@ vim_str2nr( && (maxlen == 0 || maxlen > 2)) // binary ptr += 2; + else if ((what & STR2NR_OOCT) + && (pre == 'O' || pre == 'o') && vim_isbdigit(ptr[2]) + && (maxlen == 0 || maxlen > 2)) + // octal with prefix "0o" + ptr += 2; else { // decimal or octal, default is decimal @@ -1869,9 +1876,12 @@ vim_str2nr( } } } - else if (pre == '0' || ((what & STR2NR_OCT) && (what & STR2NR_FORCE))) + else if (pre == 'O' || pre == 'o' || + pre == '0' || ((what & STR2NR_OCT) && (what & STR2NR_FORCE))) { // octal + if (pre != 0 && pre != '0') + n += 2; // skip over "0o" while ('0' <= *ptr && *ptr <= '7') { // avoid ubsan error for overflow diff --git a/src/evalfunc.c b/src/evalfunc.c index bfc811bff..d8e88e5c6 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7737,7 +7737,7 @@ f_str2nr(typval_T *argvars, typval_T *rettv) switch (base) { case 2: what |= STR2NR_BIN + STR2NR_FORCE; break; - case 8: what |= STR2NR_OCT + STR2NR_FORCE; break; + case 8: what |= STR2NR_OCT + STR2NR_OOCT + STR2NR_FORCE; break; case 16: what |= STR2NR_HEX + STR2NR_FORCE; break; } vim_str2nr(p, NULL, NULL, what, &n, NULL, 0, FALSE); diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim index 325f8e2a4..33c57fd05 100644 --- a/src/testdir/test_eval_stuff.vim +++ b/src/testdir/test_eval_stuff.vim @@ -199,9 +199,12 @@ scriptversion 4 func Test_vvar_scriptversion4() call assert_true(has('vimscript-4')) call assert_equal(17, 017) + call assert_equal(15, 0o17) + call assert_equal(15, 0O17) call assert_equal(18, 018) call assert_equal(64, 0b1'00'00'00) call assert_equal(1048576, 0x10'00'00) + call assert_equal(32768, 0o10'00'00) call assert_equal(1000000, 1'000'000) call assert_equal("1234", execute("echo 1'234")->trim()) call assert_equal('1 234', execute("echo 1''234")->trim()) @@ -211,6 +214,8 @@ endfunc scriptversion 1 func Test_vvar_scriptversion1() call assert_equal(15, 017) + call assert_equal(15, 0o17) + call assert_equal(15, 0O17) call assert_equal(18, 018) endfunc diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 2253879c9..a82c70bbc 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -189,6 +189,10 @@ func Test_str2nr() call assert_equal(65, str2nr('0101', 8)) call assert_equal(-65, str2nr('-101', 8)) call assert_equal(-65, str2nr('-0101', 8)) + call assert_equal(65, str2nr('0o101', 8)) + call assert_equal(65, str2nr('0O0101', 8)) + call assert_equal(-65, str2nr('-0O101', 8)) + call assert_equal(-65, str2nr('-0o0101', 8)) call assert_equal(11259375, str2nr('abcdef', 16)) call assert_equal(11259375, str2nr('ABCDEF', 16)) @@ -207,6 +211,7 @@ func Test_str2nr() call assert_equal(0, str2nr('0x10')) call assert_equal(0, str2nr('0b10')) + call assert_equal(0, str2nr('0o10')) call assert_equal(1, str2nr('12', 2)) call assert_equal(1, str2nr('18', 8)) call assert_equal(1, str2nr('1g', 16)) diff --git a/src/version.c b/src/version.c index 5bee0d815..9a34111d6 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 886, +/**/ 885, /**/ 884, @@ -312,11 +312,12 @@ #define NUMBUFLEN 65 // flags for vim_str2nr() -#define STR2NR_BIN 0x01 -#define STR2NR_OCT 0x02 -#define STR2NR_HEX 0x04 -#define STR2NR_ALL (STR2NR_BIN + STR2NR_OCT + STR2NR_HEX) -#define STR2NR_NO_OCT (STR2NR_BIN + STR2NR_HEX) +#define STR2NR_BIN 0x01 +#define STR2NR_OCT 0x02 +#define STR2NR_HEX 0x04 +#define STR2NR_OOCT 0x08 // Octal with prefix "0o": 0o777 +#define STR2NR_ALL (STR2NR_BIN + STR2NR_OCT + STR2NR_HEX + STR2NR_OOCT) +#define STR2NR_NO_OCT (STR2NR_BIN + STR2NR_HEX + STR2NR_OOCT) #define STR2NR_FORCE 0x80 // only when ONE of the above is used |