alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-01-03 18:06:29 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9369 'vim-patch:8.1.0596'

Browse Source
This commit is contained in:
Justin M. Keyes
2018-12-19 06:42:42 +01:00
committed by GitHub
parent cb76a8a95f 4680ca29f1
commit ccb005b9e0
2 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/strings.c
View File

@@ -1001,8 +1001,8 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
switch (length_modifier) {
case '\0':
case 'h': {
// char and short arguments are passed as int
arg = (tvs ? (int)tv_nr(tvs, &arg_idx) : va_arg(ap, int));
// char and short arguments are passed as int16_t
arg = (int16_t)(tvs ? tv_nr(tvs, &arg_idx) : va_arg(ap, int));
break;
}
case 'l': {
@@ -1033,9 +1033,9 @@ int vim_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap,
switch (length_modifier) {
case '\0':
case 'h': {
uarg = (tvs
? (unsigned)tv_nr(tvs, &arg_idx)
: va_arg(ap, unsigned));
uarg = (uint16_t)(tvs
? tv_nr(tvs, &arg_idx)
: va_arg(ap, unsigned));
break;
}
case 'l': {

31
src/nvim/testdir/test_expr.vim
View File

@@ -177,6 +177,22 @@ function Test_printf_misc()
call assert_equal('173', printf('%O', 123))
call assert_equal('7b', printf('%x', 123))
call assert_equal('7B', printf('%X', 123))
call assert_equal('123', printf('%hd', 123))
call assert_equal('-123', printf('%hd', -123))
call assert_equal('-1', printf('%hd', 0xFFFF))
call assert_equal('-1', printf('%hd', 0x1FFFFF))
call assert_equal('123', printf('%hu', 123))
call assert_equal('65413', printf('%hu', -123))
call assert_equal('65535', printf('%hu', 0xFFFF))
call assert_equal('65535', printf('%hu', 0x1FFFFF))
call assert_equal('123', printf('%ld', 123))
call assert_equal('-123', printf('%ld', -123))
call assert_equal('65535', printf('%ld', 0xFFFF))
call assert_equal('131071', printf('%ld', 0x1FFFF))
call assert_equal('{', printf('%c', 123))
call assert_equal('abc', printf('%s', 'abc'))
call assert_equal('abc', printf('%S', 'abc'))
@@ -216,6 +232,11 @@ function Test_printf_misc()
call assert_equal(' 123', printf('% *d', 5, 123))
call assert_equal(' +123', printf('%+ *d', 5, 123))
call assert_equal('foobar', printf('%.*s', 9, 'foobar'))
call assert_equal('foo', printf('%.*s', 3, 'foobar'))
call assert_equal('', printf('%.*s', 0, 'foobar'))
call assert_equal('foobar', printf('%.*s', -1, 'foobar'))
" Simple quote (thousand grouping char) is ignored.
call assert_equal('+00123456', printf("%+'09d", 123456))
@@ -238,6 +259,11 @@ function Test_printf_misc()
call assert_equal(' 00123', printf('%6.5d', 123))
call assert_equal(' 0007b', printf('%6.5x', 123))
call assert_equal('123', printf('%.2d', 123))
call assert_equal('0123', printf('%.4d', 123))
call assert_equal('0000000123', printf('%.10d', 123))
call assert_equal('123', printf('%.0d', 123))
call assert_equal('abc', printf('%2s', 'abc'))
call assert_equal('abc', printf('%2S', 'abc'))
call assert_equal('abc', printf('%.4s', 'abc'))
@@ -335,6 +361,11 @@ function Test_printf_float()
call assert_equal("str2float('inf')", printf('%s', 1.0/0.0))
call assert_equal("-str2float('inf')", printf('%s', -1.0/0.0))
" Test special case where max precision is truncated at 340.
call assert_equal('1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.330f', 1.0))
call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.340f', 1.0))
call assert_equal('1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', printf('%.350f', 1.0))
" Float nan (not a number) has no sign.
call assert_equal('nan', printf('%f', sqrt(-1.0)))
call assert_equal('nan', printf('%f', 0.0/0.0))