From af23d173883f47fd02a9a380c719e4428370b484 Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Tue, 7 Mar 2023 04:13:04 +0100 Subject: test: move oldtests to test directory (#22536) The new oldtest directory is in test/old/testdir. The reason for this is that many tests have hardcoded the parent directory name to be 'testdir'. --- test/old/testdir/test_expr.vim | 676 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 676 insertions(+) create mode 100644 test/old/testdir/test_expr.vim (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim new file mode 100644 index 0000000000..47f7f5eb0e --- /dev/null +++ b/test/old/testdir/test_expr.vim @@ -0,0 +1,676 @@ +" Tests for expressions. + +source check.vim + +func Test_equal() + let base = {} + func base.method() + return 1 + endfunc + func base.other() dict + return 1 + endfunc + let instance = copy(base) + call assert_true(base.method == instance.method) + call assert_true([base.method] == [instance.method]) + call assert_true(base.other == instance.other) + call assert_true([base.other] == [instance.other]) + + call assert_false(base.method == base.other) + call assert_false([base.method] == [base.other]) + call assert_false(base.method == instance.other) + call assert_false([base.method] == [instance.other]) + + call assert_fails('echo base.method > instance.method') +endfunc + +func Test_version() + call assert_true(has('patch-7.4.001')) + call assert_true(has('patch-7.4.01')) + call assert_true(has('patch-7.4.1')) + call assert_true(has('patch-6.9.999')) + call assert_true(has('patch-7.1.999')) + call assert_true(has('patch-7.4.123')) + + call assert_false(has('patch-7')) + call assert_false(has('patch-7.4')) + call assert_false(has('patch-7.4.')) + call assert_false(has('patch-9.1.0')) + call assert_false(has('patch-9.9.1')) +endfunc + +func Test_dict() + let d = {'': 'empty', 'a': 'a', 0: 'zero'} + call assert_equal('empty', d['']) + call assert_equal('a', d['a']) + call assert_equal('zero', d[0]) + call assert_true(has_key(d, '')) + call assert_true(has_key(d, 'a')) + call assert_fails("let i = has_key([], 'a')", 'E715:') + + let d[''] = 'none' + let d['a'] = 'aaa' + call assert_equal('none', d['']) + call assert_equal('aaa', d['a']) + + let d[ 'b' ] = 'bbb' + call assert_equal('bbb', d[ 'b' ]) +endfunc + +func Test_strgetchar() + call assert_equal(char2nr('a'), strgetchar('axb', 0)) + call assert_equal(char2nr('x'), 'axb'->strgetchar(1)) + call assert_equal(char2nr('b'), strgetchar('axb', 2)) + + call assert_equal(-1, strgetchar('axb', -1)) + call assert_equal(-1, strgetchar('axb', 3)) + call assert_equal(-1, strgetchar('', 0)) + call assert_fails("let c=strgetchar([], 1)", 'E730:') + call assert_fails("let c=strgetchar('axb', [])", 'E745:') +endfunc + +func Test_strcharpart() + call assert_equal('a', strcharpart('axb', 0, 1)) + call assert_equal('x', 'axb'->strcharpart(1, 1)) + call assert_equal('b', strcharpart('axb', 2, 1)) + call assert_equal('xb', strcharpart('axb', 1)) + + call assert_equal('', strcharpart('axb', 1, 0)) + call assert_equal('', strcharpart('axb', 1, -1)) + call assert_equal('', strcharpart('axb', -1, 1)) + call assert_equal('', strcharpart('axb', -2, 2)) + + call assert_equal('a', strcharpart('axb', -1, 2)) + + call assert_equal('edit', "editor"[-10:3]) +endfunc + +func Test_getreg_empty_list() + call assert_equal('', getreg('x')) + call assert_equal([], getreg('x', 1, 1)) + let x = getreg('x', 1, 1) + let y = x + call add(x, 'foo') + call assert_equal(['foo'], y) + call assert_fails('call getreg([])', 'E730:') +endfunc + +func Test_loop_over_null_list() + let null_list = v:_null_list + for i in null_list + call assert_report('should not get here') + endfor +endfunc + +func Test_set_reg_null_list() + call setreg('x', v:_null_list) +endfunc + +func Test_special_char() + " The failure is only visible using valgrind. + call assert_fails('echo "\') +endfunc + +func Test_option_value() + " boolean + set bri + call assert_equal(1, &bri) + set nobri + call assert_equal(0, &bri) + + " number + set ts=1 + call assert_equal(1, &ts) + set ts=8 + call assert_equal(8, &ts) + + " string + exe "set cedit=\" + call assert_equal("\", &cedit) + set cpo= + call assert_equal("", &cpo) + set cpo=abcdefi + call assert_equal("abcdefi", &cpo) + set cpo&vim +endfunc + +function Test_printf_64bit() + call assert_equal("123456789012345", printf('%d', 123456789012345)) +endfunc + +function Test_printf_spec_s() + " number + call assert_equal("1234567890", printf('%s', 1234567890)) + + " string + call assert_equal("abcdefgi", printf('%s', "abcdefgi")) + + " float + call assert_equal("1.23", printf('%s', 1.23)) + + " list + let value = [1, 'two', ['three', 4]] + call assert_equal(string(value), printf('%s', value)) + + " dict + let value = {'key1' : 'value1', 'key2' : ['list', 'value'], 'key3' : {'dict' : 'value'}} + call assert_equal(string(value), printf('%s', value)) + + " funcref + call assert_equal('printf', printf('%s', 'printf'->function())) + + " partial + call assert_equal(string(function('printf', ['%s'])), printf('%s', function('printf', ['%s']))) +endfunc + +function Test_printf_spec_b() + call assert_equal("0", printf('%b', 0)) + call assert_equal("00001100", printf('%08b', 12)) + call assert_equal("11111111", printf('%08b', 0xff)) + call assert_equal(" 1111011", printf('%10b', 123)) + call assert_equal("0001111011", printf('%010b', 123)) + call assert_equal(" 0b1111011", printf('%#10b', 123)) + call assert_equal("0B01111011", printf('%#010B', 123)) + call assert_equal("1001001100101100000001011010010", printf('%b', 1234567890)) + call assert_equal("11100000100100010000110000011011101111101111001", printf('%b', 123456789012345)) + call assert_equal("1111111111111111111111111111111111111111111111111111111111111111", printf('%b', -1)) +endfunc + +function Test_printf_misc() + call assert_equal('123', printf('123')) + call assert_fails("call printf('123', 3)", "E767:") + + call assert_equal('123', printf('%d', 123)) + call assert_equal('123', printf('%i', 123)) + call assert_equal('123', printf('%D', 123)) + call assert_equal('123', printf('%U', 123)) + call assert_equal('173', printf('%o', 123)) + 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')) + + call assert_equal('+123', printf('%+d', 123)) + call assert_equal('-123', printf('%+d', -123)) + call assert_equal('+123', printf('%+ d', 123)) + call assert_equal(' 123', printf('% d', 123)) + call assert_equal(' 123', printf('% d', 123)) + call assert_equal('-123', printf('% d', -123)) + + call assert_equal('123', printf('%2d', 123)) + call assert_equal(' 123', printf('%6d', 123)) + call assert_equal('000123', printf('%06d', 123)) + call assert_equal('+00123', printf('%+06d', 123)) + call assert_equal(' 00123', printf('% 06d', 123)) + call assert_equal(' +123', printf('%+6d', 123)) + call assert_equal(' 123', printf('% 6d', 123)) + call assert_equal(' -123', printf('% 6d', -123)) + + " Test left adjusted. + call assert_equal('123 ', printf('%-6d', 123)) + call assert_equal('+123 ', printf('%-+6d', 123)) + call assert_equal(' 123 ', printf('%- 6d', 123)) + call assert_equal('-123 ', printf('%- 6d', -123)) + + call assert_equal(' 00123', printf('%7.5d', 123)) + call assert_equal(' -00123', printf('%7.5d', -123)) + call assert_equal(' +00123', printf('%+7.5d', 123)) + " Precision field should not be used when combined with %0 + call assert_equal(' 00123', printf('%07.5d', 123)) + call assert_equal(' -00123', printf('%07.5d', -123)) + + call assert_equal(' 123', printf('%*d', 5, 123)) + call assert_equal('123 ', printf('%*d', -5, 123)) + call assert_equal('00123', printf('%.*d', 5, 123)) + 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)) + + " Unrecognized format specifier kept as-is. + call assert_equal('_123', printf("%_%d", 123)) + + " Test alternate forms. + call assert_equal('0x7b', printf('%#x', 123)) + call assert_equal('0X7B', printf('%#X', 123)) + call assert_equal('0173', printf('%#o', 123)) + call assert_equal('0173', printf('%#O', 123)) + call assert_equal('abc', printf('%#s', 'abc')) + call assert_equal('abc', printf('%#S', 'abc')) + call assert_equal(' 0173', printf('%#6o', 123)) + call assert_equal(' 00173', printf('%#6.5o', 123)) + call assert_equal(' 0173', printf('%#6.2o', 123)) + call assert_equal(' 0173', printf('%#6.2o', 123)) + call assert_equal('0173', printf('%#2.2o', 123)) + + 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')) + call assert_equal('abc', printf('%.4S', 'abc')) + call assert_equal('ab', printf('%.2s', 'abc')) + call assert_equal('ab', printf('%.2S', 'abc')) + call assert_equal('', printf('%.0s', 'abc')) + call assert_equal('', printf('%.s', 'abc')) + call assert_equal(' abc', printf('%4s', 'abc')) + call assert_equal(' abc', printf('%4S', 'abc')) + call assert_equal('0abc', printf('%04s', 'abc')) + call assert_equal('0abc', printf('%04S', 'abc')) + call assert_equal('abc ', printf('%-4s', 'abc')) + call assert_equal('abc ', printf('%-4S', 'abc')) + + call assert_equal('🐍', printf('%.2S', '🐍🐍')) + call assert_equal('', printf('%.1S', '🐍🐍')) + + call assert_equal('[ あいう]', printf('[%10.6S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[ γ‚γ„γ†γˆ]', printf('[%10.8S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.10S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.12S]', 'γ‚γ„γ†γˆγŠ')) + + call assert_equal('あいう', printf('%S', 'あいう')) + call assert_equal('あいう', printf('%#S', 'あいう')) + + call assert_equal('あb', printf('%2S', 'あb')) + call assert_equal('あb', printf('%.4S', 'あb')) + call assert_equal('あ', printf('%.2S', 'あb')) + call assert_equal(' あb', printf('%4S', 'あb')) + call assert_equal('0あb', printf('%04S', 'あb')) + call assert_equal('あb ', printf('%-4S', 'あb')) + call assert_equal('あ ', printf('%-4.2S', 'あb')) + + call assert_equal('aい', printf('%2S', 'aい')) + call assert_equal('aい', printf('%.4S', 'aい')) + call assert_equal('a', printf('%.2S', 'aい')) + call assert_equal(' aい', printf('%4S', 'aい')) + call assert_equal('0aい', printf('%04S', 'aい')) + call assert_equal('aい ', printf('%-4S', 'aい')) + call assert_equal('a ', printf('%-4.2S', 'aい')) + + call assert_equal('[あいう]', printf('[%05S]', 'あいう')) + call assert_equal('[あいう]', printf('[%06S]', 'あいう')) + call assert_equal('[0あいう]', printf('[%07S]', 'あいう')) + + call assert_equal('[あiう]', printf('[%05S]', 'あiう')) + call assert_equal('[0あiう]', printf('[%06S]', 'あiう')) + call assert_equal('[00あiう]', printf('[%07S]', 'あiう')) + + call assert_equal('[0あい]', printf('[%05.4S]', 'あいう')) + call assert_equal('[00あい]', printf('[%06.4S]', 'あいう')) + call assert_equal('[000あい]', printf('[%07.4S]', 'あいう')) + + call assert_equal('[00あi]', printf('[%05.4S]', 'あiう')) + call assert_equal('[000あi]', printf('[%06.4S]', 'あiう')) + call assert_equal('[0000あi]', printf('[%07.4S]', 'あiう')) + + call assert_equal('[0あい]', printf('[%05.5S]', 'あいう')) + call assert_equal('[00あい]', printf('[%06.5S]', 'あいう')) + call assert_equal('[000あい]', printf('[%07.5S]', 'あいう')) + + call assert_equal('[あiう]', printf('[%05.5S]', 'あiう')) + call assert_equal('[0あiう]', printf('[%06.5S]', 'あiう')) + call assert_equal('[00あiう]', printf('[%07.5S]', 'あiう')) + + call assert_equal('[0000000000]', printf('[%010.0S]', 'あいう')) + call assert_equal('[0000000000]', printf('[%010.1S]', 'あいう')) + call assert_equal('[00000000あ]', printf('[%010.2S]', 'あいう')) + call assert_equal('[00000000あ]', printf('[%010.3S]', 'あいう')) + call assert_equal('[000000あい]', printf('[%010.4S]', 'あいう')) + call assert_equal('[000000あい]', printf('[%010.5S]', 'あいう')) + call assert_equal('[0000あいう]', printf('[%010.6S]', 'あいう')) + call assert_equal('[0000あいう]', printf('[%010.7S]', 'あいう')) + + call assert_equal('[0000000000]', printf('[%010.1S]', 'あiう')) + call assert_equal('[00000000あ]', printf('[%010.2S]', 'あiう')) + call assert_equal('[0000000あi]', printf('[%010.3S]', 'あiう')) + call assert_equal('[0000000あi]', printf('[%010.4S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.5S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.6S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.7S]', 'あiう')) + + call assert_equal('1%', printf('%d%%', 1)) +endfunc + +function Test_printf_float() + call assert_equal('1.000000', printf('%f', 1)) + call assert_equal('1.230000', printf('%f', 1.23)) + call assert_equal('1.230000', printf('%F', 1.23)) + call assert_equal('9999999.9', printf('%g', 9999999.9)) + call assert_equal('9999999.9', printf('%G', 9999999.9)) + call assert_equal('1.00000001e7', printf('%.8g', 10000000.1)) + call assert_equal('1.00000001E7', printf('%.8G', 10000000.1)) + call assert_equal('1.230000e+00', printf('%e', 1.23)) + call assert_equal('1.230000E+00', printf('%E', 1.23)) + call assert_equal('1.200000e-02', printf('%e', 0.012)) + call assert_equal('-1.200000e-02', printf('%e', -0.012)) + call assert_equal('0.33', printf('%.2f', 1.0/3.0)) + call assert_equal(' 0.33', printf('%6.2f', 1.0/3.0)) + call assert_equal(' -0.33', printf('%6.2f', -1.0/3.0)) + call assert_equal('000.33', printf('%06.2f', 1.0/3.0)) + call assert_equal('-00.33', printf('%06.2f', -1.0/3.0)) + call assert_equal('-00.33', printf('%+06.2f', -1.0/3.0)) + call assert_equal('+00.33', printf('%+06.2f', 1.0/3.0)) + call assert_equal(' 00.33', printf('% 06.2f', 1.0/3.0)) + call assert_equal('000.33', printf('%06.2g', 1.0/3.0)) + call assert_equal('-00.33', printf('%06.2g', -1.0/3.0)) + call assert_equal('0.33', printf('%3.2f', 1.0/3.0)) + call assert_equal('003.33e-01', printf('%010.2e', 1.0/3.0)) + call assert_equal(' 03.33e-01', printf('% 010.2e', 1.0/3.0)) + call assert_equal('+03.33e-01', printf('%+010.2e', 1.0/3.0)) + call assert_equal('-03.33e-01', printf('%010.2e', -1.0/3.0)) + + " When precision is 0, the dot should be omitted. + call assert_equal(' 2', printf('%3.f', 7.0/3.0)) + call assert_equal(' 2', printf('%3.g', 7.0/3.0)) + call assert_equal(' 2e+00', printf('%7.e', 7.0/3.0)) + + " Float zero can be signed. + call assert_equal('+0.000000', printf('%+f', 0.0)) + call assert_equal('0.000000', printf('%f', 1.0/(1.0/0.0))) + call assert_equal('-0.000000', printf('%f', 1.0/(-1.0/0.0))) + call assert_equal('0.0', printf('%s', 1.0/(1.0/0.0))) + call assert_equal('-0.0', printf('%s', 1.0/(-1.0/0.0))) + call assert_equal('0.0', printf('%S', 1.0/(1.0/0.0))) + call assert_equal('-0.0', printf('%S', 1.0/(-1.0/0.0))) + + " Float infinity can be signed. + call assert_equal('inf', printf('%f', 1.0/0.0)) + call assert_equal('-inf', printf('%f', -1.0/0.0)) + call assert_equal('inf', printf('%g', 1.0/0.0)) + call assert_equal('-inf', printf('%g', -1.0/0.0)) + call assert_equal('inf', printf('%e', 1.0/0.0)) + call assert_equal('-inf', printf('%e', -1.0/0.0)) + call assert_equal('INF', printf('%F', 1.0/0.0)) + call assert_equal('-INF', printf('%F', -1.0/0.0)) + call assert_equal('INF', printf('%E', 1.0/0.0)) + call assert_equal('-INF', printf('%E', -1.0/0.0)) + call assert_equal('INF', printf('%E', 1.0/0.0)) + call assert_equal('-INF', printf('%G', -1.0/0.0)) + call assert_equal('+inf', printf('%+f', 1.0/0.0)) + call assert_equal('-inf', printf('%+f', -1.0/0.0)) + call assert_equal(' inf', printf('% f', 1.0/0.0)) + call assert_equal(' inf', printf('%6f', 1.0/0.0)) + call assert_equal(' -inf', printf('%6f', -1.0/0.0)) + call assert_equal(' inf', printf('%6g', 1.0/0.0)) + call assert_equal(' -inf', printf('%6g', -1.0/0.0)) + call assert_equal(' +inf', printf('%+6f', 1.0/0.0)) + call assert_equal(' inf', printf('% 6f', 1.0/0.0)) + call assert_equal(' +inf', printf('%+06f', 1.0/0.0)) + call assert_equal('inf ', printf('%-6f', 1.0/0.0)) + call assert_equal('-inf ', printf('%-6f', -1.0/0.0)) + call assert_equal('+inf ', printf('%-+6f', 1.0/0.0)) + call assert_equal(' inf ', printf('%- 6f', 1.0/0.0)) + call assert_equal('-INF ', printf('%-6F', -1.0/0.0)) + call assert_equal('+INF ', printf('%-+6F', 1.0/0.0)) + call assert_equal(' INF ', printf('%- 6F', 1.0/0.0)) + call assert_equal('INF ', printf('%-6G', 1.0/0.0)) + call assert_equal('-INF ', printf('%-6G', -1.0/0.0)) + call assert_equal('INF ', printf('%-6E', 1.0/0.0)) + call assert_equal('-INF ', printf('%-6E', -1.0/0.0)) + 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)) + call assert_equal('nan', printf('%f', -0.0/0.0)) + call assert_equal('nan', printf('%g', 0.0/0.0)) + call assert_equal('nan', printf('%e', 0.0/0.0)) + call assert_equal('NAN', printf('%F', 0.0/0.0)) + call assert_equal('NAN', printf('%G', 0.0/0.0)) + call assert_equal('NAN', printf('%E', 0.0/0.0)) + call assert_equal('NAN', printf('%F', -0.0/0.0)) + call assert_equal('NAN', printf('%G', -0.0/0.0)) + call assert_equal('NAN', printf('%E', -0.0/0.0)) + call assert_equal(' nan', printf('%6f', 0.0/0.0)) + call assert_equal(' nan', printf('%06f', 0.0/0.0)) + call assert_equal('nan ', printf('%-6f', 0.0/0.0)) + call assert_equal('nan ', printf('%- 6f', 0.0/0.0)) + call assert_equal("str2float('nan')", printf('%s', 0.0/0.0)) + call assert_equal("str2float('nan')", printf('%s', -0.0/0.0)) + call assert_equal("str2float('nan')", printf('%S', 0.0/0.0)) + call assert_equal("str2float('nan')", printf('%S', -0.0/0.0)) + + call assert_fails('echo printf("%f", "a")', 'E807:') +endfunc + +function Test_printf_errors() + call assert_fails('echo printf("%d", {})', 'E728:') + call assert_fails('echo printf("%d", [])', 'E745:') + call assert_fails('echo printf("%d", 1, 2)', 'E767:') + call assert_fails('echo printf("%*d", 1)', 'E766:') + call assert_fails('echo printf("%s")', 'E766:') + if has('float') + call assert_fails('echo printf("%d", 1.2)', 'E805:') + call assert_fails('echo printf("%f")') + endif +endfunc + +function Test_max_min_errors() + call assert_fails('call max(v:true)', 'E712:') + call assert_fails('call max(v:true)', 'max()') + call assert_fails('call min(v:true)', 'E712:') + call assert_fails('call min(v:true)', 'min()') +endfunc + +func Test_function_with_funcref() + let s:f = function('type') + let s:fref = function(s:f) + call assert_equal(v:t_string, s:fref('x')) + call assert_fails("call function('s:f')", 'E700:') + + call assert_fails("call function('foo()')", 'E475:') + call assert_fails("call function('foo()')", 'foo()') + call assert_fails("function('')", 'E129:') + + let Len = {s -> strlen(s)} + call assert_equal(6, Len('foobar')) + let name = string(Len) + " can evaluate "function('99')" + call execute('let Ref = ' .. name) + call assert_equal(4, Ref('text')) +endfunc + +func Test_funcref() + func! One() + return 1 + endfunc + let OneByName = function('One') + let OneByRef = funcref('One') + func! One() + return 2 + endfunc + call assert_equal(2, OneByName()) + call assert_equal(1, OneByRef()) + let OneByRef = 'One'->funcref() + call assert_equal(2, OneByRef()) + call assert_fails('echo funcref("{")', 'E475:') + let OneByRef = funcref("One", repeat(["foo"], 20)) + call assert_fails('let OneByRef = funcref("One", repeat(["foo"], 21))', 'E118:') + call assert_fails('echo function("min") =~ function("min")', 'E694:') +endfunc + +" Test for calling function() and funcref() outside of a Vim script context. +func Test_function_outside_script() + let cleanup =<< trim END + call writefile([execute('messages')], 'Xtest.out') + qall + END + call writefile(cleanup, 'Xverify.vim') + call RunVim([], [], "-c \"echo function('s:abc')\" -S Xverify.vim") + call assert_match('E81: Using not in a', readfile('Xtest.out')[0]) + call RunVim([], [], "-c \"echo funcref('s:abc')\" -S Xverify.vim") + call assert_match('E81: Using not in a', readfile('Xtest.out')[0]) + call delete('Xtest.out') + call delete('Xverify.vim') +endfunc + +func Test_setmatches() + hi def link 1 Comment + hi def link 2 PreProc + let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4}] + let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4}] + if has('conceal') + let set[0]['conceal'] = 5 + let exp[0]['conceal'] = '5' + endif + eval set->setmatches() + call assert_equal(exp, getmatches()) + call assert_fails('let m = setmatches([], [])', 'E745:') +endfunc + +func Test_empty_concatenate() + call assert_equal('b', 'a'[4:0] . 'b') + call assert_equal('b', 'b' . 'a'[4:0]) +endfunc + +func Test_broken_number() + let X = 'bad' + call assert_fails('echo 1X', 'E15:') + call assert_fails('echo 0b1X', 'E15:') + call assert_fails('echo 0b12', 'E15:') + call assert_fails('echo 0x1X', 'E15:') + call assert_fails('echo 011X', 'E15:') + call assert_equal(2, str2nr('2a')) + call assert_fails('inoremap b', 'E474:') +endfunc + +func Test_eval_after_if() + let s:val = '' + func SetVal(x) + let s:val ..= a:x + endfunc + if 0 | eval SetVal('a') | endif | call SetVal('b') + call assert_equal('b', s:val) +endfunc + +func Test_divide_by_zero() + " only tests that this doesn't crash, the result is not important + echo 0 / 0 + echo 0 / 0 / -1 +endfunc + +" Test for command-line completion of expressions +func Test_expr_completion() + CheckFeature cmdline_compl + for cmd in [ + \ 'let a = ', + \ 'const a = ', + \ 'if', + \ 'elseif', + \ 'while', + \ 'for', + \ 'echo', + \ 'echon', + \ 'execute', + \ 'echomsg', + \ 'echoerr', + \ 'call', + \ 'return', + \ 'cexpr', + \ 'caddexpr', + \ 'cgetexpr', + \ 'lexpr', + \ 'laddexpr', + \ 'lgetexpr'] + call feedkeys(":" . cmd . " getl\\\"\", 'xt') + call assert_equal('"' . cmd . ' getline(', getreg(':')) + endfor + + " completion for the expression register + call feedkeys(":\"\=float2\t\"\\"\", 'xt') + call assert_equal('"float2nr("', @=) + + " completion for window local variables + let w:wvar1 = 10 + let w:wvar2 = 10 + call feedkeys(":echo w:wvar\\\"\", 'xt') + call assert_equal('"echo w:wvar1 w:wvar2', @:) + unlet w:wvar1 w:wvar2 + + " completion for tab local variables + let t:tvar1 = 10 + let t:tvar2 = 10 + call feedkeys(":echo t:tvar\\\"\", 'xt') + call assert_equal('"echo t:tvar1 t:tvar2', @:) + unlet t:tvar1 t:tvar2 + + " completion for variables + let g:tvar1 = 1 + let g:tvar2 = 2 + call feedkeys(":let g:tv\\\"\", 'xt') + call assert_equal('"let g:tvar1 g:tvar2', @:) + " completion for variables after a || + call feedkeys(":echo 1 || g:tv\\\"\", 'xt') + call assert_equal('"echo 1 || g:tvar1 g:tvar2', @:) + + " completion for options + call feedkeys(":echo &compat\\\"\", 'xt') + call assert_equal('"echo &compatible', @:) + call feedkeys(":echo 1 && &compat\\\"\", 'xt') + call assert_equal('"echo 1 && &compatible', @:) + call feedkeys(":echo &g:equala\\\"\", 'xt') + call assert_equal('"echo &g:equalalways', @:) + + " completion for string + call feedkeys(":echo \"Hello\\ World\"\\\"\", 'xt') + call assert_equal("\"echo \"Hello\\ World\"\", @:) + call feedkeys(":echo 'Hello World'\\\"\", 'xt') + call assert_equal("\"echo 'Hello World'\", @:) + + " completion for command after a | + call feedkeys(":echo 'Hello' | cwin\\\"\", 'xt') + call assert_equal("\"echo 'Hello' | cwindow", @:) + + " completion for environment variable + let $X_VIM_TEST_COMPLETE_ENV = 'foo' + call feedkeys(":let $X_VIM_TEST_COMPLETE_E\\\"\", 'tx') + call assert_match('"let $X_VIM_TEST_COMPLETE_ENV', @:) + unlet $X_VIM_TEST_COMPLETE_ENV +endfunc + +" Test for errors in expression evaluation +func Test_expr_eval_error() + call assert_fails("let i = 'abc' . []", 'E730:') + call assert_fails("let l = [] + 10", 'E745:') + call assert_fails("let v = 10 + []", 'E745:') + call assert_fails("let v = 10 / []", 'E745:') + call assert_fails("let v = -{}", 'E728:') +endfunc + +" vim: shiftwidth=2 sts=2 expandtab -- cgit From 3ad845882413944a8d6ed3bd9da68c6b4cee0afb Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 9 Mar 2023 13:47:01 +0800 Subject: vim-patch:8.2.1067: expression "!expr->func()" does not work (#22585) Problem: Expression "!expr->func()" does not work. Solution: Apply plus and minus earlier. (closes vim/vim#6348) https://github.com/vim/vim/commit/0b1cd52ff6bf690388f892be686a91721a082e55 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 47f7f5eb0e..292a504df9 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -111,6 +111,13 @@ func Test_special_char() call assert_fails('echo "\') endfunc +func Test_method_with_prefix() + call assert_equal(1, !range(5)->empty()) + call assert_equal([0, 1, 2], --3->range()) + call assert_equal(0, !-3) + call assert_equal(1, !+-+0) +endfunc + func Test_option_value() " boolean set bri -- cgit From d6e2804ab4f8810293dbcd748bfb938d9e0c3d52 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 14 Apr 2023 11:00:17 +0800 Subject: vim-patch:8.2.1794: no falsy Coalescing operator Problem: No falsy Coalescing operator. Solution: Add the "??" operator. Fix mistake with function argument count. https://github.com/vim/vim/commit/92f26c256e06277ff2ec4ce7adea1eb58c85abe0 Cherry-pick tv2bool() into eval/typval.c. Cherry-pick *??* tag from Vim runtime. Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 292a504df9..66a59f2c44 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -39,6 +39,28 @@ func Test_version() call assert_false(has('patch-9.9.1')) endfunc +func Test_op_falsy() + call assert_equal(v:true, v:true ?? 456) + call assert_equal(123, 123 ?? 456) + call assert_equal('yes', 'yes' ?? 456) + call assert_equal(0z00, 0z00 ?? 456) + call assert_equal([1], [1] ?? 456) + call assert_equal(#{one: 1}, #{one: 1} ?? 456) + if has('float') + call assert_equal(0.1, 0.1 ?? 456) + endif + + call assert_equal(456, v:false ?? 456) + call assert_equal(456, 0 ?? 456) + call assert_equal(456, '' ?? 456) + call assert_equal(456, 0z ?? 456) + call assert_equal(456, [] ?? 456) + call assert_equal(456, {} ?? 456) + if has('float') + call assert_equal(456, 0.0 ?? 456) + endif +endfunc + func Test_dict() let d = {'': 'empty', 'a': 'a', 0: 'zero'} call assert_equal('empty', d['']) -- cgit From f12afd8e166e503fa0df80f932d338558afe3c3f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 14 Apr 2023 17:53:47 +0800 Subject: vim-patch:8.2.1798: Vim9: trinary operator condition is too permissive Problem: Vim9: trinary operator condition is too permissive. Solution: Use tv_get_bool_chk(). https://github.com/vim/vim/commit/1310660557470a669cc64b359e20666b116e5dbd Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 66a59f2c44..1810cf6741 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -39,6 +39,16 @@ func Test_version() call assert_false(has('patch-9.9.1')) endfunc +func Test_op_trinary() + call assert_equal('yes', 1 ? 'yes' : 'no') + call assert_equal('no', 0 ? 'yes' : 'no') + call assert_equal('no', 'x' ? 'yes' : 'no') + call assert_equal('yes', '1x' ? 'yes' : 'no') + + call assert_fails('echo [1] ? "yes" : "no"', 'E745:') + call assert_fails('echo {} ? "yes" : "no"', 'E728:') +endfunc + func Test_op_falsy() call assert_equal(v:true, v:true ?? 456) call assert_equal(123, 123 ?? 456) -- cgit From 4b49f312a05214d5d1974f7ac2702ffb407fc558 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 13:17:32 +0800 Subject: vim-patch:8.2.0633: crash when using null partial in filter() Problem: Crash when using null partial in filter(). Solution: Fix crash. Add more tests. (Yegappan Lakshmanan, closes vim/vim#5976) https://github.com/vim/vim/commit/9d8d0b5c644ea53364d04403740b3f23e57c1497 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 1810cf6741..b8ef87d714 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -22,6 +22,9 @@ func Test_equal() call assert_false([base.method] == [instance.other]) call assert_fails('echo base.method > instance.method') + " Nvim doesn't have null functions + " call assert_equal(0, test_null_function() == function('min')) + " call assert_equal(1, test_null_function() == test_null_function()) endfunc func Test_version() @@ -712,4 +715,24 @@ func Test_expr_eval_error() call assert_fails("let v = -{}", 'E728:') endfunc +" Test for float value comparison +func Test_float_compare() + CheckFeature float + call assert_true(1.2 == 1.2) + call assert_true(1.0 != 1.2) + call assert_true(1.2 > 1.0) + call assert_true(1.2 >= 1.2) + call assert_true(1.0 < 1.2) + call assert_true(1.2 <= 1.2) + call assert_true(+0.0 == -0.0) + " two NaNs (not a number) are not equal + call assert_true(sqrt(-4.01) != (0.0 / 0.0)) + " two inf (infinity) are equal + call assert_true((1.0 / 0) == (2.0 / 0)) + " two -inf (infinity) are equal + call assert_true(-(1.0 / 0) == -(2.0 / 0)) + " +infinity != -infinity + call assert_true((1.0 / 0) != -(2.0 / 0)) +endfunc + " vim: shiftwidth=2 sts=2 expandtab -- cgit From 85741677c86f7686e3597a310f8059608e7816fb Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 13:31:30 +0800 Subject: vim-patch:8.2.0634: crash with null partial and blob Problem: Crash with null partial and blob. Solution: Check for NULL pointer. Add more tests. (Yegappan Lakshmanan, closes vim/vim#5984) https://github.com/vim/vim/commit/92b83ccfda7a1d654ccaaf161a9c8a8e01fbcf76 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index b8ef87d714..1a00a85b0f 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -25,6 +25,8 @@ func Test_equal() " Nvim doesn't have null functions " call assert_equal(0, test_null_function() == function('min')) " call assert_equal(1, test_null_function() == test_null_function()) + " Nvim doesn't have test_unknown() + " call assert_fails('eval 10 == test_unknown()', 'E685:') endfunc func Test_version() @@ -137,7 +139,7 @@ func Test_loop_over_null_list() endfor endfunc -func Test_set_reg_null_list() +func Test_setreg_null_list() call setreg('x', v:_null_list) endfunc -- cgit From 700152fbf8e035e400e4bd86a2f629179b27e2ef Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 16:36:19 +0800 Subject: vim-patch:8.2.1378: cannot put space between function name and paren Problem: Cannot put space between function name and paren. Solution: Allow this for backwards compatibility. https://github.com/vim/vim/commit/bbd3e3c357487f7a5bdc704a819f63a7dd0dd66e This fixes a regression from patch 8.2.1365, which isn't ported yet. Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 1a00a85b0f..a860cf2970 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -717,6 +717,11 @@ func Test_expr_eval_error() call assert_fails("let v = -{}", 'E728:') endfunc +func Test_white_in_function_call() + let text = substitute ( 'some text' , 't' , 'T' , 'g' ) + call assert_equal('some TexT', text) +endfunc + " Test for float value comparison func Test_float_compare() CheckFeature float -- cgit From f04125a93554103ff6c24f12506050112679a33a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 16:40:22 +0800 Subject: vim-patch:8.2.3856: Vim9: not enough tests Problem: Vim9: not enough tests. Solution: Run more expression tests also with Vim9. Fix an uncovered problem. https://github.com/vim/vim/commit/fea43e44c008a7ca73b506ddab0f47b63b5d2126 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 1084 ++++++++++++++++++++++------------------ 1 file changed, 586 insertions(+), 498 deletions(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index a860cf2970..c9797551ee 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -1,6 +1,7 @@ " Tests for expressions. source check.vim +source vim9.vim func Test_equal() let base = {} @@ -45,509 +46,575 @@ func Test_version() endfunc func Test_op_trinary() - call assert_equal('yes', 1 ? 'yes' : 'no') - call assert_equal('no', 0 ? 'yes' : 'no') + let lines =<< trim END + call assert_equal('yes', 1 ? 'yes' : 'no') + call assert_equal('no', 0 ? 'yes' : 'no') + + call assert_fails('echo [1] ? "yes" : "no"', 'E745:') + call assert_fails('echo {} ? "yes" : "no"', 'E728:') + END + call CheckLegacyAndVim9Success(lines) + call assert_equal('no', 'x' ? 'yes' : 'no') + call CheckDefAndScriptFailure(["'x' ? 'yes' : 'no'"], 'E1135:') call assert_equal('yes', '1x' ? 'yes' : 'no') - - call assert_fails('echo [1] ? "yes" : "no"', 'E745:') - call assert_fails('echo {} ? "yes" : "no"', 'E728:') + call CheckDefAndScriptFailure(["'1x' ? 'yes' : 'no'"], 'E1135:') endfunc func Test_op_falsy() - call assert_equal(v:true, v:true ?? 456) - call assert_equal(123, 123 ?? 456) - call assert_equal('yes', 'yes' ?? 456) - call assert_equal(0z00, 0z00 ?? 456) - call assert_equal([1], [1] ?? 456) - call assert_equal(#{one: 1}, #{one: 1} ?? 456) - if has('float') - call assert_equal(0.1, 0.1 ?? 456) - endif - - call assert_equal(456, v:false ?? 456) - call assert_equal(456, 0 ?? 456) - call assert_equal(456, '' ?? 456) - call assert_equal(456, 0z ?? 456) - call assert_equal(456, [] ?? 456) - call assert_equal(456, {} ?? 456) - if has('float') - call assert_equal(456, 0.0 ?? 456) - endif + let lines =<< trim END + call assert_equal(v:true, v:true ?? 456) + call assert_equal(123, 123 ?? 456) + call assert_equal('yes', 'yes' ?? 456) + call assert_equal(0z00, 0z00 ?? 456) + call assert_equal([1], [1] ?? 456) + call assert_equal({'one': 1}, {'one': 1} ?? 456) + if has('float') + call assert_equal(0.1, 0.1 ?? 456) + endif + + call assert_equal(456, v:false ?? 456) + call assert_equal(456, 0 ?? 456) + call assert_equal(456, '' ?? 456) + call assert_equal(456, 0z ?? 456) + call assert_equal(456, [] ?? 456) + call assert_equal(456, {} ?? 456) + if has('float') + call assert_equal(456, 0.0 ?? 456) + endif + END + call CheckLegacyAndVim9Success(lines) endfunc func Test_dict() - let d = {'': 'empty', 'a': 'a', 0: 'zero'} - call assert_equal('empty', d['']) - call assert_equal('a', d['a']) - call assert_equal('zero', d[0]) - call assert_true(has_key(d, '')) - call assert_true(has_key(d, 'a')) - call assert_fails("let i = has_key([], 'a')", 'E715:') - - let d[''] = 'none' - let d['a'] = 'aaa' - call assert_equal('none', d['']) - call assert_equal('aaa', d['a']) + let lines =<< trim END + VAR d = {'': 'empty', 'a': 'a', 0: 'zero'} + call assert_equal('empty', d['']) + call assert_equal('a', d['a']) + call assert_equal('zero', d[0]) + call assert_true(has_key(d, '')) + call assert_true(has_key(d, 'a')) + + LET d[''] = 'none' + LET d['a'] = 'aaa' + call assert_equal('none', d['']) + call assert_equal('aaa', d['a']) + + LET d[ 'b' ] = 'bbb' + call assert_equal('bbb', d[ 'b' ]) + END + call CheckLegacyAndVim9Success(lines) - let d[ 'b' ] = 'bbb' - call assert_equal('bbb', d[ 'b' ]) + call CheckLegacyAndVim9Failure(["VAR i = has_key([], 'a')"], ['E715:', 'E1013:', 'E1206:']) endfunc func Test_strgetchar() - call assert_equal(char2nr('a'), strgetchar('axb', 0)) - call assert_equal(char2nr('x'), 'axb'->strgetchar(1)) - call assert_equal(char2nr('b'), strgetchar('axb', 2)) + let lines =<< trim END + call assert_equal(char2nr('a'), strgetchar('axb', 0)) + call assert_equal(char2nr('x'), 'axb'->strgetchar(1)) + call assert_equal(char2nr('b'), strgetchar('axb', 2)) + + call assert_equal(-1, strgetchar('axb', -1)) + call assert_equal(-1, strgetchar('axb', 3)) + call assert_equal(-1, strgetchar('', 0)) + END + call CheckLegacyAndVim9Success(lines) - call assert_equal(-1, strgetchar('axb', -1)) - call assert_equal(-1, strgetchar('axb', 3)) - call assert_equal(-1, strgetchar('', 0)) - call assert_fails("let c=strgetchar([], 1)", 'E730:') - call assert_fails("let c=strgetchar('axb', [])", 'E745:') + call CheckLegacyAndVim9Failure(["VAR c = strgetchar([], 1)"], ['E730:', 'E1013:', 'E1174:']) + call CheckLegacyAndVim9Failure(["VAR c = strgetchar('axb', [])"], ['E745:', 'E1013:', 'E1210:']) endfunc func Test_strcharpart() - call assert_equal('a', strcharpart('axb', 0, 1)) - call assert_equal('x', 'axb'->strcharpart(1, 1)) - call assert_equal('b', strcharpart('axb', 2, 1)) - call assert_equal('xb', strcharpart('axb', 1)) + let lines =<< trim END + call assert_equal('a', strcharpart('axb', 0, 1)) + call assert_equal('x', 'axb'->strcharpart(1, 1)) + call assert_equal('b', strcharpart('axb', 2, 1)) + call assert_equal('xb', strcharpart('axb', 1)) - call assert_equal('', strcharpart('axb', 1, 0)) - call assert_equal('', strcharpart('axb', 1, -1)) - call assert_equal('', strcharpart('axb', -1, 1)) - call assert_equal('', strcharpart('axb', -2, 2)) + call assert_equal('', strcharpart('axb', 1, 0)) + call assert_equal('', strcharpart('axb', 1, -1)) + call assert_equal('', strcharpart('axb', -1, 1)) + call assert_equal('', strcharpart('axb', -2, 2)) - call assert_equal('a', strcharpart('axb', -1, 2)) + call assert_equal('a', strcharpart('axb', -1, 2)) - call assert_equal('edit', "editor"[-10:3]) + call assert_equal('edit', "editor"[-10 : 3]) + END + call CheckLegacyAndVim9Success(lines) endfunc func Test_getreg_empty_list() - call assert_equal('', getreg('x')) - call assert_equal([], getreg('x', 1, 1)) - let x = getreg('x', 1, 1) - let y = x - call add(x, 'foo') - call assert_equal(['foo'], y) - call assert_fails('call getreg([])', 'E730:') + let lines =<< trim END + call assert_equal('', getreg('x')) + call assert_equal([], getreg('x', 1, 1)) + VAR x = getreg('x', 1, 1) + VAR y = x + call add(x, 'foo') + call assert_equal(['foo'], y) + END + call CheckLegacyAndVim9Success(lines) + + call CheckLegacyAndVim9Failure(['call getreg([])'], ['E730:', 'E1013:', 'E1174:']) endfunc func Test_loop_over_null_list() - let null_list = v:_null_list - for i in null_list - call assert_report('should not get here') - endfor + let lines =<< trim END + VAR null_list = v:_null_list + for i in null_list + call assert_report('should not get here') + endfor + END + call CheckLegacyAndVim9Success(lines) endfunc func Test_setreg_null_list() - call setreg('x', v:_null_list) + let lines =<< trim END + call setreg('x', v:_null_list) + END + call CheckLegacyAndVim9Success(lines) endfunc func Test_special_char() " The failure is only visible using valgrind. - call assert_fails('echo "\') + call CheckLegacyAndVim9Failure(['echo "\'], ['E15:', 'E1004:', 'E1004:']) endfunc func Test_method_with_prefix() - call assert_equal(1, !range(5)->empty()) + let lines =<< trim END + call assert_equal(TRUE, !range(5)->empty()) + call assert_equal(FALSE, !-3) + END + call CheckLegacyAndVim9Success(lines) + call assert_equal([0, 1, 2], --3->range()) - call assert_equal(0, !-3) + call CheckDefAndScriptFailure(['eval --3->range()'], 'E15') + call assert_equal(1, !+-+0) + call CheckDefAndScriptFailure(['eval !+-+0'], 'E15') endfunc func Test_option_value() - " boolean - set bri - call assert_equal(1, &bri) - set nobri - call assert_equal(0, &bri) - - " number - set ts=1 - call assert_equal(1, &ts) - set ts=8 - call assert_equal(8, &ts) - - " string - exe "set cedit=\" - call assert_equal("\", &cedit) - set cpo= - call assert_equal("", &cpo) - set cpo=abcdefi - call assert_equal("abcdefi", &cpo) - set cpo&vim -endfunc - -function Test_printf_64bit() - call assert_equal("123456789012345", printf('%d', 123456789012345)) -endfunc - -function Test_printf_spec_s() - " number - call assert_equal("1234567890", printf('%s', 1234567890)) - - " string - call assert_equal("abcdefgi", printf('%s', "abcdefgi")) - - " float - call assert_equal("1.23", printf('%s', 1.23)) - - " list - let value = [1, 'two', ['three', 4]] - call assert_equal(string(value), printf('%s', value)) - - " dict - let value = {'key1' : 'value1', 'key2' : ['list', 'value'], 'key3' : {'dict' : 'value'}} - call assert_equal(string(value), printf('%s', value)) - - " funcref - call assert_equal('printf', printf('%s', 'printf'->function())) - - " partial - call assert_equal(string(function('printf', ['%s'])), printf('%s', function('printf', ['%s']))) -endfunc - -function Test_printf_spec_b() - call assert_equal("0", printf('%b', 0)) - call assert_equal("00001100", printf('%08b', 12)) - call assert_equal("11111111", printf('%08b', 0xff)) - call assert_equal(" 1111011", printf('%10b', 123)) - call assert_equal("0001111011", printf('%010b', 123)) - call assert_equal(" 0b1111011", printf('%#10b', 123)) - call assert_equal("0B01111011", printf('%#010B', 123)) - call assert_equal("1001001100101100000001011010010", printf('%b', 1234567890)) - call assert_equal("11100000100100010000110000011011101111101111001", printf('%b', 123456789012345)) - call assert_equal("1111111111111111111111111111111111111111111111111111111111111111", printf('%b', -1)) -endfunc - -function Test_printf_misc() - call assert_equal('123', printf('123')) - call assert_fails("call printf('123', 3)", "E767:") - - call assert_equal('123', printf('%d', 123)) - call assert_equal('123', printf('%i', 123)) - call assert_equal('123', printf('%D', 123)) - call assert_equal('123', printf('%U', 123)) - call assert_equal('173', printf('%o', 123)) - 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')) - - call assert_equal('+123', printf('%+d', 123)) - call assert_equal('-123', printf('%+d', -123)) - call assert_equal('+123', printf('%+ d', 123)) - call assert_equal(' 123', printf('% d', 123)) - call assert_equal(' 123', printf('% d', 123)) - call assert_equal('-123', printf('% d', -123)) - - call assert_equal('123', printf('%2d', 123)) - call assert_equal(' 123', printf('%6d', 123)) - call assert_equal('000123', printf('%06d', 123)) - call assert_equal('+00123', printf('%+06d', 123)) - call assert_equal(' 00123', printf('% 06d', 123)) - call assert_equal(' +123', printf('%+6d', 123)) - call assert_equal(' 123', printf('% 6d', 123)) - call assert_equal(' -123', printf('% 6d', -123)) - - " Test left adjusted. - call assert_equal('123 ', printf('%-6d', 123)) - call assert_equal('+123 ', printf('%-+6d', 123)) - call assert_equal(' 123 ', printf('%- 6d', 123)) - call assert_equal('-123 ', printf('%- 6d', -123)) - - call assert_equal(' 00123', printf('%7.5d', 123)) - call assert_equal(' -00123', printf('%7.5d', -123)) - call assert_equal(' +00123', printf('%+7.5d', 123)) - " Precision field should not be used when combined with %0 - call assert_equal(' 00123', printf('%07.5d', 123)) - call assert_equal(' -00123', printf('%07.5d', -123)) - - call assert_equal(' 123', printf('%*d', 5, 123)) - call assert_equal('123 ', printf('%*d', -5, 123)) - call assert_equal('00123', printf('%.*d', 5, 123)) - 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)) - - " Unrecognized format specifier kept as-is. - call assert_equal('_123', printf("%_%d", 123)) - - " Test alternate forms. - call assert_equal('0x7b', printf('%#x', 123)) - call assert_equal('0X7B', printf('%#X', 123)) - call assert_equal('0173', printf('%#o', 123)) - call assert_equal('0173', printf('%#O', 123)) - call assert_equal('abc', printf('%#s', 'abc')) - call assert_equal('abc', printf('%#S', 'abc')) - call assert_equal(' 0173', printf('%#6o', 123)) - call assert_equal(' 00173', printf('%#6.5o', 123)) - call assert_equal(' 0173', printf('%#6.2o', 123)) - call assert_equal(' 0173', printf('%#6.2o', 123)) - call assert_equal('0173', printf('%#2.2o', 123)) - - 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')) - call assert_equal('abc', printf('%.4S', 'abc')) - call assert_equal('ab', printf('%.2s', 'abc')) - call assert_equal('ab', printf('%.2S', 'abc')) - call assert_equal('', printf('%.0s', 'abc')) - call assert_equal('', printf('%.s', 'abc')) - call assert_equal(' abc', printf('%4s', 'abc')) - call assert_equal(' abc', printf('%4S', 'abc')) - call assert_equal('0abc', printf('%04s', 'abc')) - call assert_equal('0abc', printf('%04S', 'abc')) - call assert_equal('abc ', printf('%-4s', 'abc')) - call assert_equal('abc ', printf('%-4S', 'abc')) - - call assert_equal('🐍', printf('%.2S', '🐍🐍')) - call assert_equal('', printf('%.1S', '🐍🐍')) - - call assert_equal('[ あいう]', printf('[%10.6S]', 'γ‚γ„γ†γˆγŠ')) - call assert_equal('[ γ‚γ„γ†γˆ]', printf('[%10.8S]', 'γ‚γ„γ†γˆγŠ')) - call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.10S]', 'γ‚γ„γ†γˆγŠ')) - call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.12S]', 'γ‚γ„γ†γˆγŠ')) - - call assert_equal('あいう', printf('%S', 'あいう')) - call assert_equal('あいう', printf('%#S', 'あいう')) - - call assert_equal('あb', printf('%2S', 'あb')) - call assert_equal('あb', printf('%.4S', 'あb')) - call assert_equal('あ', printf('%.2S', 'あb')) - call assert_equal(' あb', printf('%4S', 'あb')) - call assert_equal('0あb', printf('%04S', 'あb')) - call assert_equal('あb ', printf('%-4S', 'あb')) - call assert_equal('あ ', printf('%-4.2S', 'あb')) - - call assert_equal('aい', printf('%2S', 'aい')) - call assert_equal('aい', printf('%.4S', 'aい')) - call assert_equal('a', printf('%.2S', 'aい')) - call assert_equal(' aい', printf('%4S', 'aい')) - call assert_equal('0aい', printf('%04S', 'aい')) - call assert_equal('aい ', printf('%-4S', 'aい')) - call assert_equal('a ', printf('%-4.2S', 'aい')) - - call assert_equal('[あいう]', printf('[%05S]', 'あいう')) - call assert_equal('[あいう]', printf('[%06S]', 'あいう')) - call assert_equal('[0あいう]', printf('[%07S]', 'あいう')) - - call assert_equal('[あiう]', printf('[%05S]', 'あiう')) - call assert_equal('[0あiう]', printf('[%06S]', 'あiう')) - call assert_equal('[00あiう]', printf('[%07S]', 'あiう')) - - call assert_equal('[0あい]', printf('[%05.4S]', 'あいう')) - call assert_equal('[00あい]', printf('[%06.4S]', 'あいう')) - call assert_equal('[000あい]', printf('[%07.4S]', 'あいう')) - - call assert_equal('[00あi]', printf('[%05.4S]', 'あiう')) - call assert_equal('[000あi]', printf('[%06.4S]', 'あiう')) - call assert_equal('[0000あi]', printf('[%07.4S]', 'あiう')) - - call assert_equal('[0あい]', printf('[%05.5S]', 'あいう')) - call assert_equal('[00あい]', printf('[%06.5S]', 'あいう')) - call assert_equal('[000あい]', printf('[%07.5S]', 'あいう')) - - call assert_equal('[あiう]', printf('[%05.5S]', 'あiう')) - call assert_equal('[0あiう]', printf('[%06.5S]', 'あiう')) - call assert_equal('[00あiう]', printf('[%07.5S]', 'あiう')) - - call assert_equal('[0000000000]', printf('[%010.0S]', 'あいう')) - call assert_equal('[0000000000]', printf('[%010.1S]', 'あいう')) - call assert_equal('[00000000あ]', printf('[%010.2S]', 'あいう')) - call assert_equal('[00000000あ]', printf('[%010.3S]', 'あいう')) - call assert_equal('[000000あい]', printf('[%010.4S]', 'あいう')) - call assert_equal('[000000あい]', printf('[%010.5S]', 'あいう')) - call assert_equal('[0000あいう]', printf('[%010.6S]', 'あいう')) - call assert_equal('[0000あいう]', printf('[%010.7S]', 'あいう')) - - call assert_equal('[0000000000]', printf('[%010.1S]', 'あiう')) - call assert_equal('[00000000あ]', printf('[%010.2S]', 'あiう')) - call assert_equal('[0000000あi]', printf('[%010.3S]', 'あiう')) - call assert_equal('[0000000あi]', printf('[%010.4S]', 'あiう')) - call assert_equal('[00000あiう]', printf('[%010.5S]', 'あiう')) - call assert_equal('[00000あiう]', printf('[%010.6S]', 'あiう')) - call assert_equal('[00000あiう]', printf('[%010.7S]', 'あiう')) - - call assert_equal('1%', printf('%d%%', 1)) -endfunc - -function Test_printf_float() - call assert_equal('1.000000', printf('%f', 1)) - call assert_equal('1.230000', printf('%f', 1.23)) - call assert_equal('1.230000', printf('%F', 1.23)) - call assert_equal('9999999.9', printf('%g', 9999999.9)) - call assert_equal('9999999.9', printf('%G', 9999999.9)) - call assert_equal('1.00000001e7', printf('%.8g', 10000000.1)) - call assert_equal('1.00000001E7', printf('%.8G', 10000000.1)) - call assert_equal('1.230000e+00', printf('%e', 1.23)) - call assert_equal('1.230000E+00', printf('%E', 1.23)) - call assert_equal('1.200000e-02', printf('%e', 0.012)) - call assert_equal('-1.200000e-02', printf('%e', -0.012)) - call assert_equal('0.33', printf('%.2f', 1.0/3.0)) - call assert_equal(' 0.33', printf('%6.2f', 1.0/3.0)) - call assert_equal(' -0.33', printf('%6.2f', -1.0/3.0)) - call assert_equal('000.33', printf('%06.2f', 1.0/3.0)) - call assert_equal('-00.33', printf('%06.2f', -1.0/3.0)) - call assert_equal('-00.33', printf('%+06.2f', -1.0/3.0)) - call assert_equal('+00.33', printf('%+06.2f', 1.0/3.0)) - call assert_equal(' 00.33', printf('% 06.2f', 1.0/3.0)) - call assert_equal('000.33', printf('%06.2g', 1.0/3.0)) - call assert_equal('-00.33', printf('%06.2g', -1.0/3.0)) - call assert_equal('0.33', printf('%3.2f', 1.0/3.0)) - call assert_equal('003.33e-01', printf('%010.2e', 1.0/3.0)) - call assert_equal(' 03.33e-01', printf('% 010.2e', 1.0/3.0)) - call assert_equal('+03.33e-01', printf('%+010.2e', 1.0/3.0)) - call assert_equal('-03.33e-01', printf('%010.2e', -1.0/3.0)) - - " When precision is 0, the dot should be omitted. - call assert_equal(' 2', printf('%3.f', 7.0/3.0)) - call assert_equal(' 2', printf('%3.g', 7.0/3.0)) - call assert_equal(' 2e+00', printf('%7.e', 7.0/3.0)) - - " Float zero can be signed. - call assert_equal('+0.000000', printf('%+f', 0.0)) - call assert_equal('0.000000', printf('%f', 1.0/(1.0/0.0))) - call assert_equal('-0.000000', printf('%f', 1.0/(-1.0/0.0))) - call assert_equal('0.0', printf('%s', 1.0/(1.0/0.0))) - call assert_equal('-0.0', printf('%s', 1.0/(-1.0/0.0))) - call assert_equal('0.0', printf('%S', 1.0/(1.0/0.0))) - call assert_equal('-0.0', printf('%S', 1.0/(-1.0/0.0))) - - " Float infinity can be signed. - call assert_equal('inf', printf('%f', 1.0/0.0)) - call assert_equal('-inf', printf('%f', -1.0/0.0)) - call assert_equal('inf', printf('%g', 1.0/0.0)) - call assert_equal('-inf', printf('%g', -1.0/0.0)) - call assert_equal('inf', printf('%e', 1.0/0.0)) - call assert_equal('-inf', printf('%e', -1.0/0.0)) - call assert_equal('INF', printf('%F', 1.0/0.0)) - call assert_equal('-INF', printf('%F', -1.0/0.0)) - call assert_equal('INF', printf('%E', 1.0/0.0)) - call assert_equal('-INF', printf('%E', -1.0/0.0)) - call assert_equal('INF', printf('%E', 1.0/0.0)) - call assert_equal('-INF', printf('%G', -1.0/0.0)) - call assert_equal('+inf', printf('%+f', 1.0/0.0)) - call assert_equal('-inf', printf('%+f', -1.0/0.0)) - call assert_equal(' inf', printf('% f', 1.0/0.0)) - call assert_equal(' inf', printf('%6f', 1.0/0.0)) - call assert_equal(' -inf', printf('%6f', -1.0/0.0)) - call assert_equal(' inf', printf('%6g', 1.0/0.0)) - call assert_equal(' -inf', printf('%6g', -1.0/0.0)) - call assert_equal(' +inf', printf('%+6f', 1.0/0.0)) - call assert_equal(' inf', printf('% 6f', 1.0/0.0)) - call assert_equal(' +inf', printf('%+06f', 1.0/0.0)) - call assert_equal('inf ', printf('%-6f', 1.0/0.0)) - call assert_equal('-inf ', printf('%-6f', -1.0/0.0)) - call assert_equal('+inf ', printf('%-+6f', 1.0/0.0)) - call assert_equal(' inf ', printf('%- 6f', 1.0/0.0)) - call assert_equal('-INF ', printf('%-6F', -1.0/0.0)) - call assert_equal('+INF ', printf('%-+6F', 1.0/0.0)) - call assert_equal(' INF ', printf('%- 6F', 1.0/0.0)) - call assert_equal('INF ', printf('%-6G', 1.0/0.0)) - call assert_equal('-INF ', printf('%-6G', -1.0/0.0)) - call assert_equal('INF ', printf('%-6E', 1.0/0.0)) - call assert_equal('-INF ', printf('%-6E', -1.0/0.0)) - 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)) - call assert_equal('nan', printf('%f', -0.0/0.0)) - call assert_equal('nan', printf('%g', 0.0/0.0)) - call assert_equal('nan', printf('%e', 0.0/0.0)) - call assert_equal('NAN', printf('%F', 0.0/0.0)) - call assert_equal('NAN', printf('%G', 0.0/0.0)) - call assert_equal('NAN', printf('%E', 0.0/0.0)) - call assert_equal('NAN', printf('%F', -0.0/0.0)) - call assert_equal('NAN', printf('%G', -0.0/0.0)) - call assert_equal('NAN', printf('%E', -0.0/0.0)) - call assert_equal(' nan', printf('%6f', 0.0/0.0)) - call assert_equal(' nan', printf('%06f', 0.0/0.0)) - call assert_equal('nan ', printf('%-6f', 0.0/0.0)) - call assert_equal('nan ', printf('%- 6f', 0.0/0.0)) - call assert_equal("str2float('nan')", printf('%s', 0.0/0.0)) - call assert_equal("str2float('nan')", printf('%s', -0.0/0.0)) - call assert_equal("str2float('nan')", printf('%S', 0.0/0.0)) - call assert_equal("str2float('nan')", printf('%S', -0.0/0.0)) - - call assert_fails('echo printf("%f", "a")', 'E807:') -endfunc - -function Test_printf_errors() - call assert_fails('echo printf("%d", {})', 'E728:') - call assert_fails('echo printf("%d", [])', 'E745:') - call assert_fails('echo printf("%d", 1, 2)', 'E767:') - call assert_fails('echo printf("%*d", 1)', 'E766:') - call assert_fails('echo printf("%s")', 'E766:') + let lines =<< trim END + #" boolean + set bri + call assert_equal(TRUE, &bri) + set nobri + call assert_equal(FALSE, &bri) + + #" number + set ts=1 + call assert_equal(1, &ts) + set ts=8 + call assert_equal(8, &ts) + + #" string + exe "set cedit=\" + call assert_equal("\", &cedit) + set cpo= + call assert_equal("", &cpo) + set cpo=abcdefi + call assert_equal("abcdefi", &cpo) + set cpo&vim + END + call CheckLegacyAndVim9Success(lines) +endfunc + +func Test_printf_misc() + let lines =<< trim END + call assert_equal('123', printf('123')) + + call assert_equal('123', printf('%d', 123)) + call assert_equal('123', printf('%i', 123)) + call assert_equal('123', printf('%D', 123)) + call assert_equal('123', printf('%U', 123)) + call assert_equal('173', printf('%o', 123)) + 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')) + + call assert_equal('+123', printf('%+d', 123)) + call assert_equal('-123', printf('%+d', -123)) + call assert_equal('+123', printf('%+ d', 123)) + call assert_equal(' 123', printf('% d', 123)) + call assert_equal(' 123', printf('% d', 123)) + call assert_equal('-123', printf('% d', -123)) + + call assert_equal('123', printf('%2d', 123)) + call assert_equal(' 123', printf('%6d', 123)) + call assert_equal('000123', printf('%06d', 123)) + call assert_equal('+00123', printf('%+06d', 123)) + call assert_equal(' 00123', printf('% 06d', 123)) + call assert_equal(' +123', printf('%+6d', 123)) + call assert_equal(' 123', printf('% 6d', 123)) + call assert_equal(' -123', printf('% 6d', -123)) + + #" Test left adjusted. + call assert_equal('123 ', printf('%-6d', 123)) + call assert_equal('+123 ', printf('%-+6d', 123)) + call assert_equal(' 123 ', printf('%- 6d', 123)) + call assert_equal('-123 ', printf('%- 6d', -123)) + + call assert_equal(' 00123', printf('%7.5d', 123)) + call assert_equal(' -00123', printf('%7.5d', -123)) + call assert_equal(' +00123', printf('%+7.5d', 123)) + + #" Precision field should not be used when combined with %0 + call assert_equal(' 00123', printf('%07.5d', 123)) + call assert_equal(' -00123', printf('%07.5d', -123)) + + call assert_equal(' 123', printf('%*d', 5, 123)) + call assert_equal('123 ', printf('%*d', -5, 123)) + call assert_equal('00123', printf('%.*d', 5, 123)) + 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)) + + #" Unrecognized format specifier kept as-is. + call assert_equal('_123', printf("%_%d", 123)) + + #" Test alternate forms. + call assert_equal('0x7b', printf('%#x', 123)) + call assert_equal('0X7B', printf('%#X', 123)) + call assert_equal('0173', printf('%#o', 123)) + call assert_equal('0173', printf('%#O', 123)) + call assert_equal('abc', printf('%#s', 'abc')) + call assert_equal('abc', printf('%#S', 'abc')) + call assert_equal(' 0173', printf('%#6o', 123)) + call assert_equal(' 00173', printf('%#6.5o', 123)) + call assert_equal(' 0173', printf('%#6.2o', 123)) + call assert_equal(' 0173', printf('%#6.2o', 123)) + call assert_equal('0173', printf('%#2.2o', 123)) + + 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')) + call assert_equal('abc', printf('%.4S', 'abc')) + call assert_equal('ab', printf('%.2s', 'abc')) + call assert_equal('ab', printf('%.2S', 'abc')) + call assert_equal('', printf('%.0s', 'abc')) + call assert_equal('', printf('%.s', 'abc')) + call assert_equal(' abc', printf('%4s', 'abc')) + call assert_equal(' abc', printf('%4S', 'abc')) + call assert_equal('0abc', printf('%04s', 'abc')) + call assert_equal('0abc', printf('%04S', 'abc')) + call assert_equal('abc ', printf('%-4s', 'abc')) + call assert_equal('abc ', printf('%-4S', 'abc')) + + call assert_equal('🐍', printf('%.2S', '🐍🐍')) + call assert_equal('', printf('%.1S', '🐍🐍')) + + call assert_equal('[ あいう]', printf('[%10.6S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[ γ‚γ„γ†γˆ]', printf('[%10.8S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.10S]', 'γ‚γ„γ†γˆγŠ')) + call assert_equal('[γ‚γ„γ†γˆγŠ]', printf('[%10.12S]', 'γ‚γ„γ†γˆγŠ')) + + call assert_equal('あいう', printf('%S', 'あいう')) + call assert_equal('あいう', printf('%#S', 'あいう')) + + call assert_equal('あb', printf('%2S', 'あb')) + call assert_equal('あb', printf('%.4S', 'あb')) + call assert_equal('あ', printf('%.2S', 'あb')) + call assert_equal(' あb', printf('%4S', 'あb')) + call assert_equal('0あb', printf('%04S', 'あb')) + call assert_equal('あb ', printf('%-4S', 'あb')) + call assert_equal('あ ', printf('%-4.2S', 'あb')) + + call assert_equal('aい', printf('%2S', 'aい')) + call assert_equal('aい', printf('%.4S', 'aい')) + call assert_equal('a', printf('%.2S', 'aい')) + call assert_equal(' aい', printf('%4S', 'aい')) + call assert_equal('0aい', printf('%04S', 'aい')) + call assert_equal('aい ', printf('%-4S', 'aい')) + call assert_equal('a ', printf('%-4.2S', 'aい')) + + call assert_equal('[あいう]', printf('[%05S]', 'あいう')) + call assert_equal('[あいう]', printf('[%06S]', 'あいう')) + call assert_equal('[0あいう]', printf('[%07S]', 'あいう')) + + call assert_equal('[あiう]', printf('[%05S]', 'あiう')) + call assert_equal('[0あiう]', printf('[%06S]', 'あiう')) + call assert_equal('[00あiう]', printf('[%07S]', 'あiう')) + + call assert_equal('[0あい]', printf('[%05.4S]', 'あいう')) + call assert_equal('[00あい]', printf('[%06.4S]', 'あいう')) + call assert_equal('[000あい]', printf('[%07.4S]', 'あいう')) + + call assert_equal('[00あi]', printf('[%05.4S]', 'あiう')) + call assert_equal('[000あi]', printf('[%06.4S]', 'あiう')) + call assert_equal('[0000あi]', printf('[%07.4S]', 'あiう')) + + call assert_equal('[0あい]', printf('[%05.5S]', 'あいう')) + call assert_equal('[00あい]', printf('[%06.5S]', 'あいう')) + call assert_equal('[000あい]', printf('[%07.5S]', 'あいう')) + + call assert_equal('[あiう]', printf('[%05.5S]', 'あiう')) + call assert_equal('[0あiう]', printf('[%06.5S]', 'あiう')) + call assert_equal('[00あiう]', printf('[%07.5S]', 'あiう')) + + call assert_equal('[0000000000]', printf('[%010.0S]', 'あいう')) + call assert_equal('[0000000000]', printf('[%010.1S]', 'あいう')) + call assert_equal('[00000000あ]', printf('[%010.2S]', 'あいう')) + call assert_equal('[00000000あ]', printf('[%010.3S]', 'あいう')) + call assert_equal('[000000あい]', printf('[%010.4S]', 'あいう')) + call assert_equal('[000000あい]', printf('[%010.5S]', 'あいう')) + call assert_equal('[0000あいう]', printf('[%010.6S]', 'あいう')) + call assert_equal('[0000あいう]', printf('[%010.7S]', 'あいう')) + + call assert_equal('[0000000000]', printf('[%010.1S]', 'あiう')) + call assert_equal('[00000000あ]', printf('[%010.2S]', 'あiう')) + call assert_equal('[0000000あi]', printf('[%010.3S]', 'あiう')) + call assert_equal('[0000000あi]', printf('[%010.4S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.5S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.6S]', 'あiう')) + call assert_equal('[00000あiう]', printf('[%010.7S]', 'あiう')) + + call assert_equal('1%', printf('%d%%', 1)) + END + call CheckLegacyAndVim9Success(lines) + + call CheckLegacyAndVim9Failure(["call printf('123', 3)"], "E767:") +endfunc + +func Test_printf_float() + if has('float') + let lines =<< trim END + call assert_equal('1.000000', printf('%f', 1)) + call assert_equal('1.230000', printf('%f', 1.23)) + call assert_equal('1.230000', printf('%F', 1.23)) + call assert_equal('9999999.9', printf('%g', 9999999.9)) + call assert_equal('9999999.9', printf('%G', 9999999.9)) + call assert_equal('1.00000001e7', printf('%.8g', 10000000.1)) + call assert_equal('1.00000001E7', printf('%.8G', 10000000.1)) + call assert_equal('1.230000e+00', printf('%e', 1.23)) + call assert_equal('1.230000E+00', printf('%E', 1.23)) + call assert_equal('1.200000e-02', printf('%e', 0.012)) + call assert_equal('-1.200000e-02', printf('%e', -0.012)) + call assert_equal('0.33', printf('%.2f', 1.0 / 3.0)) + call assert_equal(' 0.33', printf('%6.2f', 1.0 / 3.0)) + call assert_equal(' -0.33', printf('%6.2f', -1.0 / 3.0)) + call assert_equal('000.33', printf('%06.2f', 1.0 / 3.0)) + call assert_equal('-00.33', printf('%06.2f', -1.0 / 3.0)) + call assert_equal('-00.33', printf('%+06.2f', -1.0 / 3.0)) + call assert_equal('+00.33', printf('%+06.2f', 1.0 / 3.0)) + call assert_equal(' 00.33', printf('% 06.2f', 1.0 / 3.0)) + call assert_equal('000.33', printf('%06.2g', 1.0 / 3.0)) + call assert_equal('-00.33', printf('%06.2g', -1.0 / 3.0)) + call assert_equal('0.33', printf('%3.2f', 1.0 / 3.0)) + call assert_equal('003.33e-01', printf('%010.2e', 1.0 / 3.0)) + call assert_equal(' 03.33e-01', printf('% 010.2e', 1.0 / 3.0)) + call assert_equal('+03.33e-01', printf('%+010.2e', 1.0 / 3.0)) + call assert_equal('-03.33e-01', printf('%010.2e', -1.0 / 3.0)) + + #" When precision is 0, the dot should be omitted. + call assert_equal(' 2', printf('%3.f', 7.0 / 3.0)) + call assert_equal(' 2', printf('%3.g', 7.0 / 3.0)) + call assert_equal(' 2e+00', printf('%7.e', 7.0 / 3.0)) + + #" Float zero can be signed. + call assert_equal('+0.000000', printf('%+f', 0.0)) + call assert_equal('0.000000', printf('%f', 1.0 / (1.0 / 0.0))) + call assert_equal('-0.000000', printf('%f', 1.0 / (-1.0 / 0.0))) + call assert_equal('0.0', printf('%s', 1.0 / (1.0 / 0.0))) + call assert_equal('-0.0', printf('%s', 1.0 / (-1.0 / 0.0))) + call assert_equal('0.0', printf('%S', 1.0 / (1.0 / 0.0))) + call assert_equal('-0.0', printf('%S', 1.0 / (-1.0 / 0.0))) + + #" Float infinity can be signed. + call assert_equal('inf', printf('%f', 1.0 / 0.0)) + call assert_equal('-inf', printf('%f', -1.0 / 0.0)) + call assert_equal('inf', printf('%g', 1.0 / 0.0)) + call assert_equal('-inf', printf('%g', -1.0 / 0.0)) + call assert_equal('inf', printf('%e', 1.0 / 0.0)) + call assert_equal('-inf', printf('%e', -1.0 / 0.0)) + call assert_equal('INF', printf('%F', 1.0 / 0.0)) + call assert_equal('-INF', printf('%F', -1.0 / 0.0)) + call assert_equal('INF', printf('%E', 1.0 / 0.0)) + call assert_equal('-INF', printf('%E', -1.0 / 0.0)) + call assert_equal('INF', printf('%E', 1.0 / 0.0)) + call assert_equal('-INF', printf('%G', -1.0 / 0.0)) + call assert_equal('+inf', printf('%+f', 1.0 / 0.0)) + call assert_equal('-inf', printf('%+f', -1.0 / 0.0)) + call assert_equal(' inf', printf('% f', 1.0 / 0.0)) + call assert_equal(' inf', printf('%6f', 1.0 / 0.0)) + call assert_equal(' -inf', printf('%6f', -1.0 / 0.0)) + call assert_equal(' inf', printf('%6g', 1.0 / 0.0)) + call assert_equal(' -inf', printf('%6g', -1.0 / 0.0)) + call assert_equal(' +inf', printf('%+6f', 1.0 / 0.0)) + call assert_equal(' inf', printf('% 6f', 1.0 / 0.0)) + call assert_equal(' +inf', printf('%+06f', 1.0 / 0.0)) + call assert_equal('inf ', printf('%-6f', 1.0 / 0.0)) + call assert_equal('-inf ', printf('%-6f', -1.0 / 0.0)) + call assert_equal('+inf ', printf('%-+6f', 1.0 / 0.0)) + call assert_equal(' inf ', printf('%- 6f', 1.0 / 0.0)) + call assert_equal('-INF ', printf('%-6F', -1.0 / 0.0)) + call assert_equal('+INF ', printf('%-+6F', 1.0 / 0.0)) + call assert_equal(' INF ', printf('%- 6F', 1.0 / 0.0)) + call assert_equal('INF ', printf('%-6G', 1.0 / 0.0)) + call assert_equal('-INF ', printf('%-6G', -1.0 / 0.0)) + call assert_equal('INF ', printf('%-6E', 1.0 / 0.0)) + call assert_equal('-INF ', printf('%-6E', -1.0 / 0.0)) + 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)) + call assert_equal('nan', printf('%f', -0.0 / 0.0)) + call assert_equal('nan', printf('%g', 0.0 / 0.0)) + call assert_equal('nan', printf('%e', 0.0 / 0.0)) + call assert_equal('NAN', printf('%F', 0.0 / 0.0)) + call assert_equal('NAN', printf('%G', 0.0 / 0.0)) + call assert_equal('NAN', printf('%E', 0.0 / 0.0)) + call assert_equal('NAN', printf('%F', -0.0 / 0.0)) + call assert_equal('NAN', printf('%G', -0.0 / 0.0)) + call assert_equal('NAN', printf('%E', -0.0 / 0.0)) + call assert_equal(' nan', printf('%6f', 0.0 / 0.0)) + call assert_equal(' nan', printf('%06f', 0.0 / 0.0)) + call assert_equal('nan ', printf('%-6f', 0.0 / 0.0)) + call assert_equal('nan ', printf('%- 6f', 0.0 / 0.0)) + call assert_equal("str2float('nan')", printf('%s', 0.0 / 0.0)) + call assert_equal("str2float('nan')", printf('%s', -0.0 / 0.0)) + call assert_equal("str2float('nan')", printf('%S', 0.0 / 0.0)) + call assert_equal("str2float('nan')", printf('%S', -0.0 / 0.0)) + END + call CheckLegacyAndVim9Success(lines) + + call CheckLegacyAndVim9Failure(['echo printf("%f", "a")'], 'E807:') + endif +endfunc + +func Test_printf_errors() + call CheckLegacyAndVim9Failure(['echo printf("%d", {})'], 'E728:') + call CheckLegacyAndVim9Failure(['echo printf("%d", [])'], 'E745:') + call CheckLegacyAndVim9Failure(['echo printf("%d", 1, 2)'], 'E767:') + call CheckLegacyAndVim9Failure(['echo printf("%*d", 1)'], 'E766:') + call CheckLegacyAndVim9Failure(['echo printf("%s")'], 'E766:') if has('float') - call assert_fails('echo printf("%d", 1.2)', 'E805:') - call assert_fails('echo printf("%f")') + call CheckLegacyAndVim9Failure(['echo printf("%d", 1.2)'], 'E805:') + call CheckLegacyAndVim9Failure(['echo printf("%f")'], 'E766:') endif endfunc -function Test_max_min_errors() - call assert_fails('call max(v:true)', 'E712:') - call assert_fails('call max(v:true)', 'max()') - call assert_fails('call min(v:true)', 'E712:') - call assert_fails('call min(v:true)', 'min()') +func Test_printf_64bit() + let lines =<< trim END + call assert_equal("123456789012345", printf('%d', 123456789012345)) + END + call CheckLegacyAndVim9Success(lines) endfunc -func Test_function_with_funcref() - let s:f = function('type') - let s:fref = function(s:f) - call assert_equal(v:t_string, s:fref('x')) - call assert_fails("call function('s:f')", 'E700:') +func Test_printf_spec_s() + let lines =<< trim END + #" number + call assert_equal("1234567890", printf('%s', 1234567890)) + + #" string + call assert_equal("abcdefgi", printf('%s', "abcdefgi")) + + #" float + if has('float') + call assert_equal("1.23", printf('%s', 1.23)) + endif + + #" list + VAR lvalue = [1, 'two', ['three', 4]] + call assert_equal(string(lvalue), printf('%s', lvalue)) + + #" dict + VAR dvalue = {'key1': 'value1', 'key2': ['list', 'lvalue'], 'key3': {'dict': 'lvalue'}} + call assert_equal(string(dvalue), printf('%s', dvalue)) + + #" funcref + call assert_equal('printf', printf('%s', 'printf'->function())) + + #" partial + call assert_equal(string(function('printf', ['%s'])), printf('%s', function('printf', ['%s']))) + END + call CheckLegacyAndVim9Success(lines) +endfunc + +func Test_printf_spec_b() + let lines =<< trim END + call assert_equal("0", printf('%b', 0)) + call assert_equal("00001100", printf('%08b', 12)) + call assert_equal("11111111", printf('%08b', 0xff)) + call assert_equal(" 1111011", printf('%10b', 123)) + call assert_equal("0001111011", printf('%010b', 123)) + call assert_equal(" 0b1111011", printf('%#10b', 123)) + call assert_equal("0B01111011", printf('%#010B', 123)) + call assert_equal("1001001100101100000001011010010", printf('%b', 1234567890)) + call assert_equal("11100000100100010000110000011011101111101111001", printf('%b', 123456789012345)) + call assert_equal("1111111111111111111111111111111111111111111111111111111111111111", printf('%b', -1)) + END + call CheckLegacyAndVim9Success(lines) +endfunc - call assert_fails("call function('foo()')", 'E475:') - call assert_fails("call function('foo()')", 'foo()') - call assert_fails("function('')", 'E129:') +func Test_max_min_errors() + call CheckLegacyAndVim9Failure(['call max(v:true)'], ['E712:', 'E1013:', 'E1227:']) + call CheckLegacyAndVim9Failure(['call max(v:true)'], ['max()', 'E1013:', 'E1227:']) + call CheckLegacyAndVim9Failure(['call min(v:true)'], ['E712:', 'E1013:', 'E1227:']) + call CheckLegacyAndVim9Failure(['call min(v:true)'], ['min()', 'E1013:', 'E1227:']) +endfunc - let Len = {s -> strlen(s)} - call assert_equal(6, Len('foobar')) - let name = string(Len) - " can evaluate "function('99')" - call execute('let Ref = ' .. name) - call assert_equal(4, Ref('text')) +func Test_function_with_funcref() + let lines =<< trim END + VAR s:F = function('type') + VAR s:Fref = function(s:F) + call assert_equal(v:t_string, s:Fref('x')) + call assert_fails("call function('s:F')", 'E700:') + + call assert_fails("call function('foo()')", 'E475:') + call assert_fails("call function('foo()')", 'foo()') + call assert_fails("function('')", 'E129:') + + legacy let s:Len = {s -> strlen(s)} + call assert_equal(6, s:Len('foobar')) + VAR name = string(s:Len) + #" can evaluate "function('99')" + call execute('VAR Ref = ' .. name) + call assert_equal(4, Ref('text')) + END + call CheckTransLegacySuccess(lines) + " cannot create s: variable in :def function + call CheckTransVim9Success(lines) endfunc func Test_funcref() @@ -585,33 +652,41 @@ func Test_function_outside_script() endfunc func Test_setmatches() - hi def link 1 Comment - hi def link 2 PreProc - let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4}] - let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4}] - if has('conceal') - let set[0]['conceal'] = 5 - let exp[0]['conceal'] = '5' - endif - eval set->setmatches() - call assert_equal(exp, getmatches()) - call assert_fails('let m = setmatches([], [])', 'E745:') + let lines =<< trim END + hi def link 1 Comment + hi def link 2 PreProc + VAR set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4}] + VAR exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4}] + if has('conceal') + LET set[0]['conceal'] = 5 + LET exp[0]['conceal'] = '5' + endif + eval set->setmatches() + call assert_equal(exp, getmatches()) + END + call CheckLegacyAndVim9Success(lines) + + call CheckLegacyAndVim9Failure(['VAR m = setmatches([], [])'], ['E745:', 'E1013:', 'E1210:']) endfunc func Test_empty_concatenate() - call assert_equal('b', 'a'[4:0] . 'b') - call assert_equal('b', 'b' . 'a'[4:0]) + let lines =<< trim END + call assert_equal('b', 'a'[4 : 0] .. 'b') + call assert_equal('b', 'b' .. 'a'[4 : 0]) + END + call CheckLegacyAndVim9Success(lines) endfunc func Test_broken_number() - let X = 'bad' - call assert_fails('echo 1X', 'E15:') - call assert_fails('echo 0b1X', 'E15:') - call assert_fails('echo 0b12', 'E15:') - call assert_fails('echo 0x1X', 'E15:') - call assert_fails('echo 011X', 'E15:') - call assert_equal(2, str2nr('2a')) - call assert_fails('inoremap b', 'E474:') + call CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 1X'], 'E15:') + call CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 0b1X'], 'E15:') + call CheckLegacyAndVim9Failure(['echo 0b12'], 'E15:') + call CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 0x1X'], 'E15:') + call CheckLegacyAndVim9Failure(['VAR X = "bad"', 'echo 011X'], 'E15:') + + call CheckLegacyAndVim9Success(['call assert_equal(2, str2nr("2a"))']) + + call CheckLegacyAndVim9Failure(['inoremap b'], 'E474:') endfunc func Test_eval_after_if() @@ -710,36 +785,49 @@ endfunc " Test for errors in expression evaluation func Test_expr_eval_error() - call assert_fails("let i = 'abc' . []", 'E730:') - call assert_fails("let l = [] + 10", 'E745:') - call assert_fails("let v = 10 + []", 'E745:') - call assert_fails("let v = 10 / []", 'E745:') - call assert_fails("let v = -{}", 'E728:') + call CheckLegacyAndVim9Failure(["VAR i = 'abc' .. []"], ['E730:', 'E1105:', 'E730:']) + call CheckLegacyAndVim9Failure(["VAR l = [] + 10"], ['E745:', 'E1051:', 'E745']) + call CheckLegacyAndVim9Failure(["VAR v = 10 + []"], ['E745:', 'E1051:', 'E745:']) + call CheckLegacyAndVim9Failure(["VAR v = 10 / []"], ['E745:', 'E1036:', 'E745:']) + call CheckLegacyAndVim9Failure(["VAR v = -{}"], ['E728:', 'E1012:', 'E728:']) endfunc func Test_white_in_function_call() - let text = substitute ( 'some text' , 't' , 'T' , 'g' ) - call assert_equal('some TexT', text) + let lines =<< trim END + VAR text = substitute ( 'some text' , 't' , 'T' , 'g' ) + call assert_equal('some TexT', text) + END + call CheckTransLegacySuccess(lines) + + let lines =<< trim END + var text = substitute ( 'some text' , 't' , 'T' , 'g' ) + call assert_equal('some TexT', text) + END + call CheckDefAndScriptFailure(lines, ['E1001:', 'E121:']) endfunc " Test for float value comparison func Test_float_compare() CheckFeature float - call assert_true(1.2 == 1.2) - call assert_true(1.0 != 1.2) - call assert_true(1.2 > 1.0) - call assert_true(1.2 >= 1.2) - call assert_true(1.0 < 1.2) - call assert_true(1.2 <= 1.2) - call assert_true(+0.0 == -0.0) - " two NaNs (not a number) are not equal - call assert_true(sqrt(-4.01) != (0.0 / 0.0)) - " two inf (infinity) are equal - call assert_true((1.0 / 0) == (2.0 / 0)) - " two -inf (infinity) are equal - call assert_true(-(1.0 / 0) == -(2.0 / 0)) - " +infinity != -infinity - call assert_true((1.0 / 0) != -(2.0 / 0)) + + let lines =<< trim END + call assert_true(1.2 == 1.2) + call assert_true(1.0 != 1.2) + call assert_true(1.2 > 1.0) + call assert_true(1.2 >= 1.2) + call assert_true(1.0 < 1.2) + call assert_true(1.2 <= 1.2) + call assert_true(+0.0 == -0.0) + #" two NaNs (not a number) are not equal + call assert_true(sqrt(-4.01) != (0.0 / 0.0)) + #" two inf (infinity) are equal + call assert_true((1.0 / 0) == (2.0 / 0)) + #" two -inf (infinity) are equal + call assert_true(-(1.0 / 0) == -(2.0 / 0)) + #" +infinity != -infinity + call assert_true((1.0 / 0) != -(2.0 / 0)) + END + call CheckLegacyAndVim9Success(lines) endfunc " vim: shiftwidth=2 sts=2 expandtab -- cgit From b29df57ba7e7e853a3f8082020e7658f468ea826 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 17:12:59 +0800 Subject: vim-patch:8.2.4361: Vim9: some tests fail Problem: Vim9: some tests fail. Solution: Fix the tests, mostly by removing "s:". https://github.com/vim/vim/commit/62b191c38758c835a577ef091a803b6dd4cd4f49 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index c9797551ee..95ae54b6c1 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -613,7 +613,8 @@ func Test_function_with_funcref() call assert_equal(4, Ref('text')) END call CheckTransLegacySuccess(lines) - " cannot create s: variable in :def function + " skip CheckTransDefSuccess(), cannot assign to script variable + call map(lines, {k, v -> v =~ 'legacy' ? v : substitute(v, 's:', '', 'g')}) call CheckTransVim9Success(lines) endfunc -- cgit From 408e5d16a9ecce7e4107298faf3e8f36f0712495 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 17:13:54 +0800 Subject: vim-patch:8.2.4373: expression test fails Problem: Expression test fails. Solution: Make the test work with latest Vim9 syntax. https://github.com/vim/vim/commit/c87aa34dfd68e95e4b1aac96d2274fcd672753ac Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 95ae54b6c1..3e5b21a07c 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -596,8 +596,8 @@ endfunc func Test_function_with_funcref() let lines =<< trim END - VAR s:F = function('type') - VAR s:Fref = function(s:F) + let s:F = function('type') + let s:Fref = function(s:F) call assert_equal(v:t_string, s:Fref('x')) call assert_fails("call function('s:F')", 'E700:') @@ -605,17 +605,34 @@ func Test_function_with_funcref() call assert_fails("call function('foo()')", 'foo()') call assert_fails("function('')", 'E129:') - legacy let s:Len = {s -> strlen(s)} + let s:Len = {s -> strlen(s)} call assert_equal(6, s:Len('foobar')) - VAR name = string(s:Len) - #" can evaluate "function('99')" - call execute('VAR Ref = ' .. name) + let name = string(s:Len) + " can evaluate "function('99')" + call execute('let Ref = ' .. name) call assert_equal(4, Ref('text')) END - call CheckTransLegacySuccess(lines) - " skip CheckTransDefSuccess(), cannot assign to script variable - call map(lines, {k, v -> v =~ 'legacy' ? v : substitute(v, 's:', '', 'g')}) - call CheckTransVim9Success(lines) + call CheckScriptSuccess(lines) + + let lines =<< trim END + vim9script + var F = function('type') + var Fref = function(F) + call assert_equal(v:t_string, Fref('x')) + call assert_fails("call function('F')", 'E700:') + + call assert_fails("call function('foo()')", 'E475:') + call assert_fails("call function('foo()')", 'foo()') + call assert_fails("function('')", 'E129:') + + var Len = (s) => strlen(s) + call assert_equal(6, Len('foobar')) + var name = string(Len) + # can evaluate "function('99')" + call execute('var Ref = ' .. name) + call assert_equal(4, Ref('text')) + END + call CheckScriptSuccess(lines) endfunc func Test_funcref() -- cgit From 1b556c04bfd3f4c381db5f62a2e25ebf63165712 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 17:04:04 +0800 Subject: vim-patch:8.2.4476: operator name spelled wrong Problem: Operator name spelled wrong. Solution: Change trinary to ternary. (Goc Dundar, closes vim/vim#9850) https://github.com/vim/vim/commit/e41c1dd8890d3f701253255993f4e9af2d12225c Co-authored-by: =?UTF-8?q?Dundar=20G=C3=B6c?= --- test/old/testdir/test_expr.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 3e5b21a07c..c8b7fde100 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -45,7 +45,7 @@ func Test_version() call assert_false(has('patch-9.9.1')) endfunc -func Test_op_trinary() +func Test_op_ternary() let lines =<< trim END call assert_equal('yes', 1 ? 'yes' : 'no') call assert_equal('no', 0 ? 'yes' : 'no') -- cgit From bacb5021d4eff33c67eb659fb01125b2abcacd79 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 14 Apr 2023 21:08:00 +0800 Subject: vim-patch:8.2.4883: string interpolation only works in heredoc Problem: String interpolation only works in heredoc. Solution: Support interpolated strings. Use syntax for heredoc consistent with strings, similar to C#. (closes vim/vim#10327) https://github.com/vim/vim/commit/2eaef106e4a7fc9dc74a7e672b5f550ec1f9786e Cherry-pick Test_Debugger_breakadd_expr() from Vim. Co-authored-by: LemonBoy --- test/old/testdir/test_expr.vim | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index c8b7fde100..86e720a1ae 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -848,4 +848,60 @@ func Test_float_compare() call CheckLegacyAndVim9Success(lines) endfunc +func Test_string_interp() + let lines =<< trim END + call assert_equal('', $"") + call assert_equal('foobar', $"foobar") + #" Escaping rules. + call assert_equal('"foo"{bar}', $"\"foo\"{{bar}}") + call assert_equal('"foo"{bar}', $'"foo"{{bar}}') + call assert_equal('foobar', $"{\"foo\"}" .. $'{''bar''}') + #" Whitespace before/after the expression. + call assert_equal('3', $"{ 1 + 2 }") + #" String conversion. + call assert_equal('hello from ' .. v:version, $"hello from {v:version}") + call assert_equal('hello from ' .. v:version, $'hello from {v:version}') + #" Paper over a small difference between VimScript behaviour. + call assert_equal(string(v:true), $"{v:true}") + call assert_equal('(1+1=2)', $"(1+1={1 + 1})") + #" Hex-escaped opening brace: char2nr('{') == 0x7b + call assert_equal('esc123ape', $"esc\x7b123}ape") + call assert_equal('me{}me', $"me{\x7b}\x7dme") + VAR var1 = "sun" + VAR var2 = "shine" + call assert_equal('sunshine', $"{var1}{var2}") + call assert_equal('sunsunsun', $"{var1->repeat(3)}") + #" Multibyte strings. + call assert_equal('say ハロー・ワールド', $"say {'ハロー・ワールド'}") + #" Nested. + call assert_equal('foobarbaz', $"foo{$\"{'bar'}\"}baz") + #" Do not evaluate blocks when the expr is skipped. + VAR tmp = 0 + if v:false + echo "${ LET tmp += 1 }" + endif + call assert_equal(0, tmp) + + #" Stray closing brace. + call assert_fails('echo $"moo}"', 'E1278:') + #" Undefined variable in expansion. + call assert_fails('echo $"{moo}"', 'E121:') + #" Empty blocks are rejected. + call assert_fails('echo $"{}"', 'E15:') + call assert_fails('echo $"{ }"', 'E15:') + END + call CheckLegacyAndVim9Success(lines) + + let lines =<< trim END + call assert_equal('5', $"{({x -> x + 1})(4)}") + END + call CheckLegacySuccess(lines) + + let lines =<< trim END + call assert_equal('5', $"{((x) => x + 1)(4)}") + call assert_fails('echo $"{ # foo }"', 'E1279:') + END + call CheckDefAndScriptSuccess(lines) +endfunc + " vim: shiftwidth=2 sts=2 expandtab -- cgit From ef9af89da753235c64cbd8b7d700c686bc94dad7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 15 Apr 2023 17:51:39 +0800 Subject: vim-patch:8.2.4930: interpolated string expression requires escaping Problem: Interpolated string expression requires escaping. Solution: Do not require escaping in the expression. https://github.com/vim/vim/commit/0abc2871c105882ed1c1effb9a7757fad8a395bd Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 86e720a1ae..dee7266bb5 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -855,7 +855,7 @@ func Test_string_interp() #" Escaping rules. call assert_equal('"foo"{bar}', $"\"foo\"{{bar}}") call assert_equal('"foo"{bar}', $'"foo"{{bar}}') - call assert_equal('foobar', $"{\"foo\"}" .. $'{''bar''}') + call assert_equal('foobar', $"{"foo"}" .. $'{'bar'}') #" Whitespace before/after the expression. call assert_equal('3', $"{ 1 + 2 }") #" String conversion. @@ -865,8 +865,8 @@ func Test_string_interp() call assert_equal(string(v:true), $"{v:true}") call assert_equal('(1+1=2)', $"(1+1={1 + 1})") #" Hex-escaped opening brace: char2nr('{') == 0x7b - call assert_equal('esc123ape', $"esc\x7b123}ape") - call assert_equal('me{}me', $"me{\x7b}\x7dme") + call assert_equal('esc123ape', $"esc{123}ape") + call assert_equal('me{}me', $"me{"\x7b"}\x7dme") VAR var1 = "sun" VAR var2 = "shine" call assert_equal('sunshine', $"{var1}{var2}") @@ -874,7 +874,7 @@ func Test_string_interp() #" Multibyte strings. call assert_equal('say ハロー・ワールド', $"say {'ハロー・ワールド'}") #" Nested. - call assert_equal('foobarbaz', $"foo{$\"{'bar'}\"}baz") + call assert_equal('foobarbaz', $"foo{$"{'bar'}"}baz") #" Do not evaluate blocks when the expr is skipped. VAR tmp = 0 if v:false -- cgit From 43c49746d9cf82dba0d56b07d39722f9ebeecf90 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 25 Apr 2023 21:32:12 +0800 Subject: vim-patch:9.0.0335: checks for Dictionary argument often give a vague error (#23309) Problem: Checks for Dictionary argument often give a vague error message. Solution: Give a useful error message. (Yegappan Lakshmanan, closes vim/vim#11009) https://github.com/vim/vim/commit/04c4c5746e15884768d2cb41370c3276a196cd4c Cherry-pick removal of E922 from docs from patch 9.0.1403. Co-authored-by: Yegappan Lakshmanan --- test/old/testdir/test_expr.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index dee7266bb5..ff3dfb83cb 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -105,7 +105,7 @@ func Test_dict() END call CheckLegacyAndVim9Success(lines) - call CheckLegacyAndVim9Failure(["VAR i = has_key([], 'a')"], ['E715:', 'E1013:', 'E1206:']) + call CheckLegacyAndVim9Failure(["VAR i = has_key([], 'a')"], ['E1206:', 'E1013:', 'E1206:']) endfunc func Test_strgetchar() -- cgit From 9f29176033926b81553985deaba0ea162ca40215 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 28 Apr 2023 00:01:22 +0800 Subject: vim-patch:9.0.1492: using uninitialized memory when argument is missing (#23351) Problem: Using uninitialized memory when argument is missing. Solution: Check there are sufficient arguments before the base. (closes vim/vim#12302) https://github.com/vim/vim/commit/b7f2270bab102d68f83a6300699b7f98efad81f2 Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index ff3dfb83cb..fe79145fc9 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -407,6 +407,9 @@ func Test_printf_misc() call CheckLegacyAndVim9Success(lines) call CheckLegacyAndVim9Failure(["call printf('123', 3)"], "E767:") + + " this was using uninitialized memory + call CheckLegacyAndVim9Failure(["eval ''->printf()"], "E119:") endfunc func Test_printf_float() -- cgit From 066db5e7cdaadfb1d2971bdc4b9200f14737d7b6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 30 Apr 2023 23:24:16 +0800 Subject: vim-patch:9.0.1500: The falsy operator is not tested properly (#23407) Problem: The falsy operator is not tested properly. Solution: Add a few more test cases. (closes vim/vim#12319) https://github.com/vim/vim/commit/58a44751cec55be1ace0d4be5367dc19bc56be5d --- test/old/testdir/test_expr.vim | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index fe79145fc9..9e089d50b8 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -69,9 +69,7 @@ func Test_op_falsy() call assert_equal(0z00, 0z00 ?? 456) call assert_equal([1], [1] ?? 456) call assert_equal({'one': 1}, {'one': 1} ?? 456) - if has('float') - call assert_equal(0.1, 0.1 ?? 456) - endif + call assert_equal(0.1, 0.1 ?? 456) call assert_equal(456, v:false ?? 456) call assert_equal(456, 0 ?? 456) @@ -79,8 +77,23 @@ func Test_op_falsy() call assert_equal(456, 0z ?? 456) call assert_equal(456, [] ?? 456) call assert_equal(456, {} ?? 456) - if has('float') - call assert_equal(456, 0.0 ?? 456) + call assert_equal(456, 0.0 ?? 456) + + call assert_equal(456, v:null ?? 456) + #" call assert_equal(456, v:none ?? 456) + call assert_equal(456, v:_null_string ?? 456) + call assert_equal(456, v:_null_blob ?? 456) + call assert_equal(456, v:_null_list ?? 456) + call assert_equal(456, v:_null_dict ?? 456) + #" Nvim doesn't have null functions + #" call assert_equal(456, test_null_function() ?? 456) + #" Nvim doesn't have null partials + #" call assert_equal(456, test_null_partial() ?? 456) + if has('job') + call assert_equal(456, test_null_job() ?? 456) + endif + if has('channel') + call assert_equal(456, test_null_channel() ?? 456) endif END call CheckLegacyAndVim9Success(lines) -- cgit From d745433817499c34ccf230469417fb0ea29b7ab9 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 8 May 2023 22:40:18 +0800 Subject: vim-patch:9.0.1522: some functions give two error messages Problem: Some functions give two error messages. Solution: Do not give a second error message. (closes vim/vim#12352) https://github.com/vim/vim/commit/e4098457ab9c94225b1b0e3c5e06b82b75587971 It seems that tv_get_bool() is actually not exactly the same as tv_get_number(), so change it to a function instead. Co-authored-by: Bram Moolenaar --- test/old/testdir/test_expr.vim | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 9e089d50b8..d771234983 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -154,6 +154,8 @@ func Test_strcharpart() call assert_equal('edit', "editor"[-10 : 3]) END call CheckLegacyAndVim9Success(lines) + + call assert_fails('echo strcharpart("", 0, 0, {})', ['E728:', 'E728:']) endfunc func Test_getreg_empty_list() -- cgit From 625926f729137658d0a8a73a55aeefc5583488c3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 8 May 2023 22:49:53 +0800 Subject: vim-patch:9.0.1524: passing -1 for bool is not always rejected Problem: Passing -1 for bool is not always rejected. Solution: Check for error in a better way. (closes vim/vim#12358) https://github.com/vim/vim/commit/8cf51376b842e0060edf08bd2e5bd9933c552ecf --- test/old/testdir/test_expr.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index d771234983..4cb8da8c74 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -155,7 +155,8 @@ func Test_strcharpart() END call CheckLegacyAndVim9Success(lines) - call assert_fails('echo strcharpart("", 0, 0, {})', ['E728:', 'E728:']) + call assert_fails('call strcharpart("", 0, 0, {})', ['E728:', 'E728:']) + call assert_fails('call strcharpart("", 0, 0, -1)', ['E1023:', 'E1023:']) endfunc func Test_getreg_empty_list() -- cgit From 842a47d6a4103a75e33c2c0023dbae5ad2c0f534 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 15 Aug 2023 19:16:19 +0800 Subject: vim-patch:9.0.1704: Cannot use positional arguments for printf() (#24719) Problem: Cannot use positional arguments for printf() Solution: Support positional arguments in string formatting closes: vim/vim#12140 https://github.com/vim/vim/commit/0c6181fec4c362eb9682d5af583341eb20cb1af5 Co-authored-by: Christ van Willegen --- test/old/testdir/test_expr.vim | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index 4cb8da8c74..bf1ba240eb 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -239,6 +239,8 @@ func Test_printf_misc() let lines =<< trim END call assert_equal('123', printf('123')) + call assert_equal('', printf('%')) + call assert_equal('', printf('%.0d', 0)) call assert_equal('123', printf('%d', 123)) call assert_equal('123', printf('%i', 123)) call assert_equal('123', printf('%D', 123)) -- cgit From db64280be5ff866b80ffa80569838688bfd7caa5 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 17 Aug 2023 13:01:45 +0800 Subject: vim-patch:8.2.3908: cannot use a script-local function for 'foldtext' Problem: Cannot use a script-local function for 'foldtext'. Solution: Expand "s:" and "". (Yegappan Lakshmanan, closes vim/vim#9411) https://github.com/vim/vim/commit/27708e6c7b6f444fd599f3dc5015336b002b874d Cherry-pick test_filter_map.vim change from patch 8.2.3871. Co-authored-by: Yegappan Lakshmanan --- test/old/testdir/test_expr.vim | 1 + 1 file changed, 1 insertion(+) (limited to 'test/old/testdir/test_expr.vim') diff --git a/test/old/testdir/test_expr.vim b/test/old/testdir/test_expr.vim index bf1ba240eb..d316e63818 100644 --- a/test/old/testdir/test_expr.vim +++ b/test/old/testdir/test_expr.vim @@ -421,6 +421,7 @@ func Test_printf_misc() call assert_equal('[00000あiう]', printf('[%010.7S]', 'あiう')) call assert_equal('1%', printf('%d%%', 1)) + call assert_notequal('', printf('%p', "abc")) END call CheckLegacyAndVim9Success(lines) -- cgit