Mercurial > vim

comparison src/testdir/test_listdict.vim @ 25597:0fdacd8f0cf3 v8.2.3335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3335: Vim9: not enough tests run with Vim9 Commit: https://github.com/vim/vim/commit/ef98257593a0abf1300d0f70358dc45a70a62580 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 12 19:27:57 2021 +0200 patch 8.2.3335: Vim9: not enough tests run with Vim9 Problem: Vim9: not enough tests run with Vim9. Solution: Run a few more tests in Vim9 script and :def function. Fix that items(), keys() and values9) return zero for a NULL dict. Make join() return an empty string for a NULL list. Make sort() return an empty list for a NULL list.
author Bram Moolenaar <Bram@vim.org>
date Thu, 12 Aug 2021 19:30:03 +0200
parents c4e29355cd8b
children b85e44974a08
comparison
equal deleted inserted replaced
25596:15ce187b41b8 25597:0fdacd8f0cf3
843 call s:arg_list_test(1, 2, [3, 4], {5: 6}) 843 call s:arg_list_test(1, 2, [3, 4], {5: 6})
844 endfunc 844 endfunc
845 845
846 " Tests for reverse(), sort(), uniq() 846 " Tests for reverse(), sort(), uniq()
847 func Test_reverse_sort_uniq() 847 func Test_reverse_sort_uniq()
848 let l = ['-0', 'A11', 2, 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5] 848 let lines =<< trim END
849 call assert_equal(['-0', 'A11', 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5], uniq(copy(l))) 849 VAR l = ['-0', 'A11', 2, 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5]
850 call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(l)) 850 call assert_equal(['-0', 'A11', 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5], uniq(copy(l)))
851 call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(reverse(l))) 851 call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(l))
852 if has('float') 852 call assert_equal([1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0'], reverse(reverse(l)))
853 call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(l)) 853 if has('float')
854 call assert_equal([[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0'], reverse(sort(l))) 854 call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(l))
855 call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(reverse(sort(l)))) 855 call assert_equal([[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0'], reverse(sort(l)))
856 call assert_equal(['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]], uniq(sort(l))) 856 call assert_equal(['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]], sort(reverse(sort(l))))
857 857 call assert_equal(['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]], uniq(sort(l)))
858 let l = [7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four'] 858
859 call assert_equal([-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255], sort(copy(l), 'n')) 859 LET l = [7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four']
860 860 call assert_equal([-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255], sort(copy(l), 'n'))
861 let l = [7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []] 861
862 call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 1)) 862 LET l = [7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
863 call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i')) 863 call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 1))
864 call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l))) 864 call assert_equal(['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l), 'i'))
865 endif 865 call assert_equal(['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}], sort(copy(l)))
866 endif
867 END
868 call CheckLegacyAndVim9Success(lines)
866 869
867 call assert_fails('call reverse("")', 'E899:') 870 call assert_fails('call reverse("")', 'E899:')
868 call assert_fails('call uniq([1, 2], {x, y -> []})', 'E745:') 871 call assert_fails('call uniq([1, 2], {x, y -> []})', 'E745:')
869 call assert_fails("call sort([1, 2], function('min'), 1)", "E715:") 872 call assert_fails("call sort([1, 2], function('min'), 1)", "E715:")
870 call assert_fails("call sort([1, 2], function('invalid_func'))", "E700:") 873 call assert_fails("call sort([1, 2], function('invalid_func'))", "E700:")
871 call assert_fails("call sort([1, 2], function('min'))", "E118:") 874 call assert_fails("call sort([1, 2], function('min'))", "E118:")
872 endfunc 875 endfunc
873 876
874 " reduce a list or a blob 877 " reduce a list or a blob
875 func Test_reduce() 878 func Test_reduce()
876 call assert_equal(1, reduce([], { acc, val -> acc + val }, 1)) 879 let lines =<< trim END
877 call assert_equal(10, reduce([1, 3, 5], { acc, val -> acc + val }, 1)) 880 call assert_equal(1, reduce([], LSTART acc, val LMIDDLE acc + val LEND, 1))
878 call assert_equal(2 * (2 * ((2 * 1) + 2) + 3) + 4, reduce([2, 3, 4], { acc, val -> 2 * acc + val }, 1)) 881 call assert_equal(10, reduce([1, 3, 5], LSTART acc, val LMIDDLE acc + val LEND, 1))
879 call assert_equal('a x y z', ['x', 'y', 'z']->reduce({ acc, val -> acc .. ' ' .. val}, 'a')) 882 call assert_equal(2 * (2 * ((2 * 1) + 2) + 3) + 4, reduce([2, 3, 4], LSTART acc, val LMIDDLE 2 * acc + val LEND, 1))
880 call assert_equal(#{ x: 1, y: 1, z: 1 }, ['x', 'y', 'z']->reduce({ acc, val -> extend(acc, { val: 1 }) }, {})) 883 call assert_equal('a x y z', ['x', 'y', 'z']->reduce(LSTART acc, val LMIDDLE acc .. ' ' .. val LEND, 'a'))
881 call assert_equal([0, 1, 2, 3], reduce([1, 2, 3], function('add'), [0])) 884 call assert_equal([0, 1, 2, 3], reduce([1, 2, 3], function('add'), [0]))
882 885
883 let l = ['x', 'y', 'z'] 886 VAR l = ['x', 'y', 'z']
884 call assert_equal(42, reduce(l, function('get'), #{ x: #{ y: #{ z: 42 } } })) 887 call assert_equal(42, reduce(l, function('get'), {'x': {'y': {'z': 42 } } }))
885 call assert_equal(['x', 'y', 'z'], l) 888 call assert_equal(['x', 'y', 'z'], l)
886 889
887 call assert_equal(1, reduce([1], { acc, val -> acc + val })) 890 call assert_equal(1, reduce([1], LSTART acc, val LMIDDLE acc + val LEND))
888 call assert_equal('x y z', reduce(['x', 'y', 'z'], { acc, val -> acc .. ' ' .. val })) 891 call assert_equal('x y z', reduce(['x', 'y', 'z'], LSTART acc, val LMIDDLE acc .. ' ' .. val LEND))
889 call assert_equal(120, range(1, 5)->reduce({ acc, val -> acc * val })) 892 call assert_equal(120, range(1, 5)->reduce(LSTART acc, val LMIDDLE acc * val LEND))
893
894 call assert_equal(1, reduce(0z, LSTART acc, val LMIDDLE acc + val LEND, 1))
895 call assert_equal(1 + 0xaf + 0xbf + 0xcf, reduce(0zAFBFCF, LSTART acc, val LMIDDLE acc + val LEND, 1))
896 call assert_equal(2 * (2 * 1 + 0xaf) + 0xbf, 0zAFBF->reduce(LSTART acc, val LMIDDLE 2 * acc + val LEND, 1))
897
898 call assert_equal(0xff, reduce(0zff, LSTART acc, val LMIDDLE acc + val LEND))
899 call assert_equal(2 * (2 * 0xaf + 0xbf) + 0xcf, reduce(0zAFBFCF, LSTART acc, val LMIDDLE 2 * acc + val LEND))
900 END
901 call CheckLegacyAndVim9Success(lines)
902
903 call assert_equal({'x': 1, 'y': 1, 'z': 1 }, ['x', 'y', 'z']->reduce({ acc, val -> extend(acc, { val: 1 }) }, {}))
904 vim9 assert_equal({'x': 1, 'y': 1, 'z': 1 }, ['x', 'y', 'z']->reduce((acc, val) => extend(acc, {[val]: 1 }), {}))
905
890 call assert_fails("call reduce([], { acc, val -> acc + val })", 'E998: Reduce of an empty List with no initial value') 906 call assert_fails("call reduce([], { acc, val -> acc + val })", 'E998: Reduce of an empty List with no initial value')
891
892 call assert_equal(1, reduce(0z, { acc, val -> acc + val }, 1))
893 call assert_equal(1 + 0xaf + 0xbf + 0xcf, reduce(0zAFBFCF, { acc, val -> acc + val }, 1))
894 call assert_equal(2 * (2 * 1 + 0xaf) + 0xbf, 0zAFBF->reduce({ acc, val -> 2 * acc + val }, 1))
895
896 call assert_equal(0xff, reduce(0zff, { acc, val -> acc + val }))
897 call assert_equal(2 * (2 * 0xaf + 0xbf) + 0xcf, reduce(0zAFBFCF, { acc, val -> 2 * acc + val }))
898 call assert_fails("call reduce(0z, { acc, val -> acc + val })", 'E998: Reduce of an empty Blob with no initial value') 907 call assert_fails("call reduce(0z, { acc, val -> acc + val })", 'E998: Reduce of an empty Blob with no initial value')
899 908
900 call assert_fails("call reduce({}, { acc, val -> acc + val }, 1)", 'E897:') 909 call assert_fails("call reduce({}, { acc, val -> acc + val }, 1)", 'E897:')
901 call assert_fails("call reduce(0, { acc, val -> acc + val }, 1)", 'E897:') 910 call assert_fails("call reduce(0, { acc, val -> acc + val }, 1)", 'E897:')
902 call assert_fails("call reduce('', { acc, val -> acc + val }, 1)", 'E897:') 911 call assert_fails("call reduce('', { acc, val -> acc + val }, 1)", 'E897:')
920 call assert_fails('echo reduce([1], test_null_partial())', 'E1132:') 929 call assert_fails('echo reduce([1], test_null_partial())', 'E1132:')
921 endfunc 930 endfunc
922 931
923 " splitting a string to a List using split() 932 " splitting a string to a List using split()
924 func Test_str_split() 933 func Test_str_split()
925 call assert_equal(['aa', 'bb'], split(' aa bb ')) 934 let lines =<< trim END
926 call assert_equal(['aa', 'bb'], split(' aa bb ', '\W\+', 0)) 935 call assert_equal(['aa', 'bb'], split(' aa bb '))
927 call assert_equal(['', 'aa', 'bb', ''], split(' aa bb ', '\W\+', 1)) 936 call assert_equal(['aa', 'bb'], split(' aa bb ', '\W\+', 0))
928 call assert_equal(['', '', 'aa', '', 'bb', '', ''], split(' aa bb ', '\W', 1)) 937 call assert_equal(['', 'aa', 'bb', ''], split(' aa bb ', '\W\+', 1))
929 call assert_equal(['aa', '', 'bb'], split(':aa::bb:', ':', 0)) 938 call assert_equal(['', '', 'aa', '', 'bb', '', ''], split(' aa bb ', '\W', 1))
930 call assert_equal(['', 'aa', '', 'bb', ''], split(':aa::bb:', ':', 1)) 939 call assert_equal(['aa', '', 'bb'], split(':aa::bb:', ':', 0))
931 call assert_equal(['aa', '', 'bb', 'cc', ''], split('aa,,bb, cc,', ',\s*', 1)) 940 call assert_equal(['', 'aa', '', 'bb', ''], split(':aa::bb:', ':', 1))
932 call assert_equal(['a', 'b', 'c'], split('abc', '\zs')) 941 call assert_equal(['aa', '', 'bb', 'cc', ''], split('aa,,bb, cc,', ',\s*', 1))
933 call assert_equal(['', 'a', '', 'b', '', 'c', ''], split('abc', '\zs', 1)) 942 call assert_equal(['a', 'b', 'c'], split('abc', '\zs'))
943 call assert_equal(['', 'a', '', 'b', '', 'c', ''], split('abc', '\zs', 1))
944 call assert_equal(['abc'], split('abc', '\\%('))
945 END
946 call CheckLegacyAndVim9Success(lines)
947
934 call assert_fails("call split('abc', [])", 'E730:') 948 call assert_fails("call split('abc', [])", 'E730:')
935 call assert_fails("call split('abc', 'b', [])", 'E745:') 949 call assert_fails("call split('abc', 'b', [])", 'E745:')
936 call assert_equal(['abc'], split('abc', '\\%('))
937 endfunc 950 endfunc
938 951
939 " compare recursively linked list and dict 952 " compare recursively linked list and dict
940 func Test_listdict_compare() 953 func Test_listdict_compare()
941 let l = [1, 2, 3, 4] 954 let lines =<< trim END
942 let d = {'1': 1, '2': l, '3': 3} 955 VAR l = [1, 2, 3, '4']
943 let l[1] = d 956 VAR d = {'1': 1, '2': l, '3': 3}
944 call assert_true(l == l) 957 LET l[1] = d
945 call assert_true(d == d) 958 call assert_true(l == l)
946 call assert_false(l != deepcopy(l)) 959 call assert_true(d == d)
947 call assert_false(d != deepcopy(d)) 960 call assert_false(l != deepcopy(l))
961 call assert_false(d != deepcopy(d))
962 END
963 call CheckLegacyAndVim9Success(lines)
948 964
949 " comparison errors 965 " comparison errors
950 call assert_fails('echo [1, 2] =~ {}', 'E691:') 966 call assert_fails('echo [1, 2] =~ {}', 'E691:')
951 call assert_fails('echo [1, 2] =~ [1, 2]', 'E692:') 967 call assert_fails('echo [1, 2] =~ [1, 2]', 'E692:')
952 call assert_fails('echo {} =~ 5', 'E735:') 968 call assert_fails('echo {} =~ 5', 'E735:')
953 call assert_fails('echo {} =~ {}', 'E736:') 969 call assert_fails('echo {} =~ {}', 'E736:')
954 endfunc 970 endfunc
955 971
956 " compare complex recursively linked list and dict 972 " compare complex recursively linked list and dict
957 func Test_listdict_compare_complex() 973 func Test_listdict_compare_complex()
958 let l = [] 974 let lines =<< trim END
959 call add(l, l) 975 VAR l = []
960 let dict4 = {"l": l} 976 call add(l, l)
961 call add(dict4.l, dict4) 977 VAR dict4 = {"l": l}
962 let lcopy = deepcopy(l) 978 call add(dict4.l, dict4)
963 let dict4copy = deepcopy(dict4) 979 VAR lcopy = deepcopy(l)
964 call assert_true(l == lcopy) 980 VAR dict4copy = deepcopy(dict4)
965 call assert_true(dict4 == dict4copy) 981 call assert_true(l == lcopy)
982 call assert_true(dict4 == dict4copy)
983 END
984 call CheckLegacyAndVim9Success(lines)
966 endfunc 985 endfunc
967 986
968 " Test for extending lists and dictionaries 987 " Test for extending lists and dictionaries
969 func Test_listdict_extend() 988 func Test_listdict_extend()
970 " Test extend() with lists 989 " Test extend() with lists
971 990
972 " Pass the same List to extend() 991 " Pass the same List to extend()
973 let l = [1, 2, 3] 992 let lines =<< trim END
974 call assert_equal([1, 2, 3, 1, 2, 3], extend(l, l)) 993 VAR l = [1, 2, 3]
975 call assert_equal([1, 2, 3, 1, 2, 3], l) 994 call assert_equal([1, 2, 3, 1, 2, 3], extend(l, l))
976 995 call assert_equal([1, 2, 3, 1, 2, 3], l)
977 let l = [1, 2, 3] 996
978 call assert_equal([1, 2, 3, 4, 5, 6], extend(l, [4, 5, 6])) 997 LET l = [1, 2, 3]
979 call assert_equal([1, 2, 3, 4, 5, 6], l) 998 call assert_equal([1, 2, 3, 4, 5, 6], extend(l, [4, 5, 6]))
980 999 call assert_equal([1, 2, 3, 4, 5, 6], l)
981 let l = [1, 2, 3] 1000
982 call extend(l, [4, 5, 6], 0) 1001 LET l = [1, 2, 3]
983 call assert_equal([4, 5, 6, 1, 2, 3], l) 1002 call extend(l, [4, 5, 6], 0)
984 1003 call assert_equal([4, 5, 6, 1, 2, 3], l)
985 let l = [1, 2, 3] 1004
986 call extend(l, [4, 5, 6], 1) 1005 LET l = [1, 2, 3]
987 call assert_equal([1, 4, 5, 6, 2, 3], l) 1006 call extend(l, [4, 5, 6], 1)
988 1007 call assert_equal([1, 4, 5, 6, 2, 3], l)
989 let l = [1, 2, 3] 1008
990 call extend(l, [4, 5, 6], 3) 1009 LET l = [1, 2, 3]
991 call assert_equal([1, 2, 3, 4, 5, 6], l) 1010 call extend(l, [4, 5, 6], 3)
992 1011 call assert_equal([1, 2, 3, 4, 5, 6], l)
993 let l = [1, 2, 3] 1012
994 call extend(l, [4, 5, 6], -1) 1013 LET l = [1, 2, 3]
995 call assert_equal([1, 2, 4, 5, 6, 3], l) 1014 call extend(l, [4, 5, 6], -1)
996 1015 call assert_equal([1, 2, 4, 5, 6, 3], l)
997 let l = [1, 2, 3] 1016
998 call extend(l, [4, 5, 6], -3) 1017 LET l = [1, 2, 3]
999 call assert_equal([4, 5, 6, 1, 2, 3], l) 1018 call extend(l, [4, 5, 6], -3)
1019 call assert_equal([4, 5, 6, 1, 2, 3], l)
1020 END
1021 call CheckLegacyAndVim9Success(lines)
1000 1022
1001 let l = [1, 2, 3] 1023 let l = [1, 2, 3]
1002 call assert_fails("call extend(l, [4, 5, 6], 4)", 'E684:') 1024 call assert_fails("call extend(l, [4, 5, 6], 4)", 'E684:')
1003 call assert_fails("call extend(l, [4, 5, 6], -4)", 'E684:') 1025 call assert_fails("call extend(l, [4, 5, 6], -4)", 'E684:')
1004 if has('float') 1026 if has('float')
1006 endif 1028 endif
1007 1029
1008 " Test extend() with dictionaries. 1030 " Test extend() with dictionaries.
1009 1031
1010 " Pass the same Dict to extend() 1032 " Pass the same Dict to extend()
1011 let d = { 'a': {'b': 'B'}} 1033 let lines =<< trim END
1012 call extend(d, d) 1034 VAR d = {'a': {'b': 'B'}, 'x': 9}
1013 call assert_equal({'a': {'b': 'B'}}, d) 1035 call extend(d, d)
1014 1036 call assert_equal({'a': {'b': 'B'}, 'x': 9}, d)
1015 let d = {'a': 'A', 'b': 'B'} 1037
1016 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, extend(d, {'b': 0, 'c':'C'})) 1038 LET d = {'a': 'A', 'b': 9}
1017 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, d) 1039 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, extend(d, {'b': 0, 'c': 'C'}))
1018 1040 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, d)
1019 let d = {'a': 'A', 'b': 'B'} 1041
1020 call extend(d, {'a': 'A', 'b': 0, 'c': 'C'}, "force") 1042 LET d = {'a': 'A', 'b': 9}
1021 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, d) 1043 call extend(d, {'a': 'A', 'b': 0, 'c': 'C'}, "force")
1022 1044 call assert_equal({'a': 'A', 'b': 0, 'c': 'C'}, d)
1023 let d = {'a': 'A', 'b': 'B'} 1045
1024 call extend(d, {'b': 0, 'c':'C'}, "keep") 1046 LET d = {'a': 'A', 'b': 9}
1025 call assert_equal({'a': 'A', 'b': 'B', 'c': 'C'}, d) 1047 call extend(d, {'b': 0, 'c': 'C'}, "keep")
1048 call assert_equal({'a': 'A', 'b': 9, 'c': 'C'}, d)
1049 END
1050 call CheckLegacyAndVim9Success(lines)
1026 1051
1027 let d = {'a': 'A', 'b': 'B'} 1052 let d = {'a': 'A', 'b': 'B'}
1028 call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'error')", 'E737:') 1053 call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'error')", 'E737:')
1029 call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'xxx')", 'E475:') 1054 call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'xxx')", 'E475:')
1030 if has('float') 1055 if has('float')
1037 1062
1038 " Extend g: dictionary with an invalid variable name 1063 " Extend g: dictionary with an invalid variable name
1039 call assert_fails("call extend(g:, {'-!' : 10})", 'E461:') 1064 call assert_fails("call extend(g:, {'-!' : 10})", 'E461:')
1040 1065
1041 " Extend a list with itself. 1066 " Extend a list with itself.
1042 let l = [1, 5, 7] 1067 let lines =<< trim END
1043 call extend(l, l, 0) 1068 VAR l = [1, 5, 7]
1044 call assert_equal([1, 5, 7, 1, 5, 7], l) 1069 call extend(l, l, 0)
1045 let l = [1, 5, 7] 1070 call assert_equal([1, 5, 7, 1, 5, 7], l)
1046 call extend(l, l, 1) 1071 LET l = [1, 5, 7]
1047 call assert_equal([1, 1, 5, 7, 5, 7], l) 1072 call extend(l, l, 1)
1048 let l = [1, 5, 7] 1073 call assert_equal([1, 1, 5, 7, 5, 7], l)
1049 call extend(l, l, 2) 1074 LET l = [1, 5, 7]
1050 call assert_equal([1, 5, 1, 5, 7, 7], l) 1075 call extend(l, l, 2)
1051 let l = [1, 5, 7] 1076 call assert_equal([1, 5, 1, 5, 7, 7], l)
1052 call extend(l, l, 3) 1077 LET l = [1, 5, 7]
1053 call assert_equal([1, 5, 7, 1, 5, 7], l) 1078 call extend(l, l, 3)
1079 call assert_equal([1, 5, 7, 1, 5, 7], l)
1080 END
1081 call CheckLegacyAndVim9Success(lines)
1054 endfunc 1082 endfunc
1055 1083
1056 func Test_listdict_extendnew() 1084 func Test_listdict_extendnew()
1057 " Test extendnew() with lists 1085 " Test extendnew() with lists
1058 let l = [1, 2, 3] 1086 let l = [1, 2, 3]
1198 call assert_fails("echo t[0]", 'E685:') 1226 call assert_fails("echo t[0]", 'E685:')
1199 endfunc 1227 endfunc
1200 1228
1201 " Test for a null list 1229 " Test for a null list
1202 func Test_null_list() 1230 func Test_null_list()
1231 let lines =<< trim END
1232 VAR l = test_null_list()
1233 call assert_equal('', join(test_null_list()))
1234 call assert_equal('', join(l))
1235 call assert_equal(0, len(l))
1236 call assert_equal(1, empty(l))
1237 call assert_equal([], split(test_null_string()))
1238 call assert_equal([], l[ : 2])
1239 call assert_true([] == l)
1240 call assert_equal('[]', string(l))
1241 call assert_equal([], sort(test_null_list()))
1242 call assert_equal([], sort(l))
1243 call assert_equal([], uniq(test_null_list()))
1244 call assert_equal([], uniq(l))
1245 VAR k = [] + l
1246 call assert_equal([], k)
1247 LET k = l + []
1248 call assert_equal([], k)
1249 call assert_equal(0, len(copy(l)))
1250 call assert_equal(0, count(l, 5))
1251 call assert_equal([], deepcopy(l))
1252 call assert_equal(5, get(l, 2, 5))
1253 call assert_equal(-1, index(l, 2, 5))
1254 call assert_equal(0, min(l))
1255 call assert_equal(0, max(l))
1256 call assert_equal(0, remove(test_null_list(), 0, 2))
1257 call assert_equal([], repeat(l, 2))
1258 call assert_equal([], reverse(test_null_list()))
1259 call assert_equal([], reverse(l))
1260 call assert_equal([], sort(test_null_list()))
1261 call assert_equal([], sort(l))
1262 call assert_equal('[]', string(l))
1263 END
1264 call CheckLegacyAndVim9Success(lines)
1265
1203 let l = test_null_list() 1266 let l = test_null_list()
1204 call assert_equal(0, join(test_null_list())) 1267 call assert_equal([], extend(l, l, 0))
1205 call assert_equal('', join(l)) 1268 call assert_equal(0, insert(test_null_list(), 2, -1))
1206 call assert_equal(0, len(l))
1207 call assert_equal(1, empty(l))
1208 call assert_fails('let s = join([1, 2], [])', 'E730:') 1269 call assert_fails('let s = join([1, 2], [])', 'E730:')
1209 call assert_equal([], split(test_null_string())) 1270 call assert_fails('call remove(l, 0, 2)', 'E684:')
1210 call assert_equal([], l[:2])
1211 call assert_true([] == l)
1212 call assert_equal('[]', string(l))
1213 call assert_equal(0, sort(test_null_list()))
1214 call assert_equal([], sort(l))
1215 call assert_equal(0, uniq(test_null_list()))
1216 call assert_equal([], uniq(l))
1217 let k = [] + l
1218 call assert_equal([], k)
1219 let k = l + []
1220 call assert_equal([], k)
1221 call assert_equal(0, len(copy(l)))
1222 call assert_equal(0, count(l, 5))
1223 call assert_equal([], deepcopy(l))
1224 call assert_equal(5, get(l, 2, 5))
1225 call assert_equal(-1, index(l, 2, 5))
1226 call assert_equal(0, insert(test_null_list(), 2, -1))
1227 call assert_fails('call insert(l, 2, -1)', 'E684:') 1271 call assert_fails('call insert(l, 2, -1)', 'E684:')
1228 call assert_equal(0, min(l))
1229 call assert_equal(0, max(l))
1230 call assert_equal(0, remove(test_null_list(), 0, 2))
1231 call assert_fails('call remove(l, 0, 2)', 'E684:')
1232 call assert_equal([], repeat(l, 2))
1233 call assert_equal(0, reverse(test_null_list()))
1234 call assert_equal([], reverse(l))
1235 call assert_equal(0, sort(test_null_list()))
1236 call assert_equal([], sort(l))
1237 call assert_equal('[]', string(l))
1238 call assert_fails('call extend(test_null_list(), test_null_list())', 'E1134:') 1272 call assert_fails('call extend(test_null_list(), test_null_list())', 'E1134:')
1239 call assert_equal([], extend(l, l, 0)) 1273
1240 lockvar l 1274 lockvar l
1241 call assert_equal(1, islocked('l')) 1275 call assert_equal(1, islocked('l'))
1242 unlockvar l 1276 unlockvar l
1243 endfunc 1277 endfunc
1244 1278
1245 " Test for a null dict 1279 " Test for a null dict
1246 func Test_null_dict() 1280 func Test_null_dict()
1247 call assert_equal(test_null_dict(), test_null_dict()) 1281 let lines =<< trim END
1282 call assert_equal(test_null_dict(), test_null_dict())
1283 VAR d = test_null_dict()
1284 call assert_equal({}, d)
1285 call assert_equal(0, len(d))
1286 call assert_equal(1, empty(d))
1287 call assert_equal([], items(test_null_dict()))
1288 call assert_equal([], items(d))
1289 call assert_equal([], keys(test_null_dict()))
1290 call assert_equal([], keys(d))
1291 call assert_equal([], values(test_null_dict()))
1292 call assert_equal([], values(d))
1293 call assert_false(has_key(d, 'k'))
1294 call assert_equal('{}', string(d))
1295 call assert_equal({}, {})
1296 call assert_equal(0, len(copy(d)))
1297 call assert_equal(0, count(d, 'k'))
1298 call assert_equal({}, deepcopy(d))
1299 call assert_equal(20, get(d, 'k', 20))
1300 call assert_equal(0, min(d))
1301 call assert_equal(0, max(d))
1302 call assert_equal(0, remove(test_null_dict(), 'k'))
1303 call assert_equal('{}', string(d))
1304 END
1305 call CheckLegacyAndVim9Success(lines)
1306
1248 let d = test_null_dict() 1307 let d = test_null_dict()
1249 call assert_equal({}, d) 1308 call assert_equal({}, extend(d, d, 'keep'))
1250 call assert_equal(0, len(d)) 1309 call assert_fails("call remove(d, 'k')", 'E716:')
1251 call assert_equal(1, empty(d))
1252 call assert_equal(0, items(test_null_dict()))
1253 call assert_equal([], items(d))
1254 call assert_equal(0, keys(test_null_dict()))
1255 call assert_equal([], keys(d))
1256 call assert_equal(0, values(test_null_dict()))
1257 call assert_equal([], values(d))
1258 call assert_false(has_key(d, 'k'))
1259 call assert_equal('{}', string(d))
1260 call assert_fails('let x = d[10]', 'E716:') 1310 call assert_fails('let x = d[10]', 'E716:')
1261 call assert_equal({}, {})
1262 call assert_equal(0, len(copy(d)))
1263 call assert_equal(0, count(d, 'k'))
1264 call assert_equal({}, deepcopy(d))
1265 call assert_equal(20, get(d, 'k', 20))
1266 call assert_equal(0, min(d))
1267 call assert_equal(0, max(d))
1268 call assert_equal(0, remove(test_null_dict(), 'k'))
1269 call assert_fails("call remove(d, 'k')", 'E716:')
1270 call assert_equal('{}', string(d))
1271 call assert_fails('call extend(test_null_dict(), test_null_dict())', 'E1133:') 1311 call assert_fails('call extend(test_null_dict(), test_null_dict())', 'E1133:')
1272 call assert_equal({}, extend(d, d, 'keep'))
1273 lockvar d 1312 lockvar d
1274 call assert_equal(1, islocked('d')) 1313 call assert_equal(1, islocked('d'))
1275 unlockvar d 1314 unlockvar d
1276 endfunc 1315 endfunc
1277 1316