To: vim_dev@googlegroups.com Subject: Patch 8.2.0597 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0597 Problem: Test_eval is old style. Solution: Change some tests to a new style test. Files: src/testdir/test_eval.in, src/testdir/test_eval.ok, src/testdir/test_eval_stuff.vim *** ../vim-8.2.0596/src/testdir/test_eval.in 2017-12-22 21:45:54.000000000 +0100 --- src/testdir/test_eval.in 2020-04-18 21:53:53.770781934 +0200 *************** *** 36,79 **** endtry endfun :fun Test() - $put ='{{{1 let tests' - let @" = 'abc' - AR " - let @" = "abc\n" - AR " - let @" = "abc\" - AR " - let @= = '"abc"' - AR = - - $put ='{{{1 Basic setreg tests' - call SetReg('a', 'abcA', 'c') - call SetReg('b', 'abcB', 'v') - call SetReg('c', 'abcC', 'l') - call SetReg('d', 'abcD', 'V') - call SetReg('e', 'abcE', 'b') - call SetReg('f', 'abcF', "\") - call SetReg('g', 'abcG', 'b10') - call SetReg('h', 'abcH', "\10") - call SetReg('I', 'abcI') - - $put ='{{{1 Appending single lines with setreg()' - call SetReg('A', 'abcAc', 'c') - call SetReg('A', 'abcAl', 'l') - call SetReg('A', 'abcAc2','c') - call SetReg('b', 'abcBc', 'ca') - call SetReg('b', 'abcBb', 'ba') - call SetReg('b', 'abcBc2','ca') - call SetReg('b', 'abcBb2','b50a') - - call SetReg('C', 'abcCl', 'l') - call SetReg('C', 'abcCc', 'c') - call SetReg('D', 'abcDb', 'b') - - call SetReg('E', 'abcEb', 'b') - call SetReg('E', 'abcEl', 'l') - call SetReg('F', 'abcFc', 'c') - $put ='{{{1 Appending NL with setreg()' call setreg('a', 'abcA2', 'c') call setreg('b', 'abcB2', 'v') --- 36,41 ---- *** ../vim-8.2.0596/src/testdir/test_eval.ok 2020-04-18 20:51:37.353348315 +0200 --- src/testdir/test_eval.ok 2020-04-18 21:53:09.970881874 +0200 *************** *** 1,114 **** - {{{1 let tests - ": type v; value: abc (['abc']), expr: abc (['abc']) - ": type V; value: abc (['abc']), expr: abc (['abc']) - ": type V; value: abc (['abc ']), expr: abc (['abc ']) - =: type v; value: abc (['abc']), expr: "abc" (['"abc"']) - {{{1 Basic setreg tests - {{{2 setreg('a', 'abcA', 'c') - a: type v; value: abcA (['abcA']), expr: abcA (['abcA']) - == - =abcA= - {{{2 setreg('b', 'abcB', 'v') - b: type v; value: abcB (['abcB']), expr: abcB (['abcB']) - == - =abcB= - {{{2 setreg('c', 'abcC', 'l') - c: type V; value: abcC (['abcC']), expr: abcC (['abcC']) - == - abcC - == - {{{2 setreg('d', 'abcD', 'V') - d: type V; value: abcD (['abcD']), expr: abcD (['abcD']) - == - abcD - == - {{{2 setreg('e', 'abcE', 'b') - e: type 4; value: abcE (['abcE']), expr: abcE (['abcE']) - == - =abcE= - {{{2 setreg('f', 'abcF', '') - f: type 4; value: abcF (['abcF']), expr: abcF (['abcF']) - == - =abcF= - {{{2 setreg('g', 'abcG', 'b10') - g: type 10; value: abcG (['abcG']), expr: abcG (['abcG']) - == - =abcG = - {{{2 setreg('h', 'abcH', '10') - h: type 10; value: abcH (['abcH']), expr: abcH (['abcH']) - == - =abcH = - {{{2 setreg('I', 'abcI') - I: type v; value: abcI (['abcI']), expr: abcI (['abcI']) - == - =abcI= - {{{1 Appending single lines with setreg() - {{{2 setreg('A', 'abcAc', 'c') - A: type v; value: abcAabcAc (['abcAabcAc']), expr: abcAabcAc (['abcAabcAc']) - == - =abcAabcAc= - {{{2 setreg('A', 'abcAl', 'l') - A: type V; value: abcAabcAcabcAl (['abcAabcAcabcAl']), expr: abcAabcAcabcAl (['abcAabcAcabcAl']) - == - abcAabcAcabcAl - == - {{{2 setreg('A', 'abcAc2', 'c') - A: type v; value: abcAabcAcabcAlabcAc2 (['abcAabcAcabcAl', 'abcAc2']), expr: abcAabcAcabcAlabcAc2 (['abcAabcAcabcAl', 'abcAc2']) - == - =abcAabcAcabcAl - abcAc2= - {{{2 setreg('b', 'abcBc', 'ca') - b: type v; value: abcBabcBc (['abcBabcBc']), expr: abcBabcBc (['abcBabcBc']) - == - =abcBabcBc= - {{{2 setreg('b', 'abcBb', 'ba') - b: type 5; value: abcBabcBcabcBb (['abcBabcBcabcBb']), expr: abcBabcBcabcBb (['abcBabcBcabcBb']) - == - =abcBabcBcabcBb= - {{{2 setreg('b', 'abcBc2', 'ca') - b: type v; value: abcBabcBcabcBbabcBc2 (['abcBabcBcabcBb', 'abcBc2']), expr: abcBabcBcabcBbabcBc2 (['abcBabcBcabcBb', 'abcBc2']) - == - =abcBabcBcabcBb - abcBc2= - {{{2 setreg('b', 'abcBb2', 'b50a') - b: type 50; value: abcBabcBcabcBbabcBc2abcBb2 (['abcBabcBcabcBb', 'abcBc2abcBb2']), expr: abcBabcBcabcBbabcBc2abcBb2 (['abcBabcBcabcBb', 'abcBc2abcBb2']) - == - =abcBabcBcabcBb = - abcBc2abcBb2 - {{{2 setreg('C', 'abcCl', 'l') - C: type V; value: abcCabcCl (['abcC', 'abcCl']), expr: abcCabcCl (['abcC', 'abcCl']) - == - abcC - abcCl - == - {{{2 setreg('C', 'abcCc', 'c') - C: type v; value: abcCabcClabcCc (['abcC', 'abcCl', 'abcCc']), expr: abcCabcClabcCc (['abcC', 'abcCl', 'abcCc']) - == - =abcC - abcCl - abcCc= - {{{2 setreg('D', 'abcDb', 'b') - D: type 5; value: abcDabcDb (['abcD', 'abcDb']), expr: abcDabcDb (['abcD', 'abcDb']) - == - =abcD = - abcDb - {{{2 setreg('E', 'abcEb', 'b') - E: type 5; value: abcEabcEb (['abcE', 'abcEb']), expr: abcEabcEb (['abcE', 'abcEb']) - == - =abcE = - abcEb - {{{2 setreg('E', 'abcEl', 'l') - E: type V; value: abcEabcEbabcEl (['abcE', 'abcEb', 'abcEl']), expr: abcEabcEbabcEl (['abcE', 'abcEb', 'abcEl']) - == - abcE - abcEb - abcEl - == - {{{2 setreg('F', 'abcFc', 'c') - F: type v; value: abcFabcFc (['abcF', 'abcFc']), expr: abcFabcFc (['abcF', 'abcFc']) - == - =abcF - abcFc= {{{1 Appending NL with setreg() {{{2 setreg('A', '') A: type V; value: abcA2 (['abcA2']), expr: abcA2 (['abcA2']) --- 1,3 ---- *** ../vim-8.2.0596/src/testdir/test_eval_stuff.vim 2020-03-20 18:20:47.080975621 +0100 --- src/testdir/test_eval_stuff.vim 2020-04-18 21:54:46.342661030 +0200 *************** *** 235,238 **** --- 235,358 ---- call assert_equal(64, v:numbersize) endfunc + func Assert_reg(name, type, value, valuestr, expr, exprstr) + call assert_equal(a:type, getregtype(a:name)) + call assert_equal(a:value, getreg(a:name)) + call assert_equal(a:valuestr, string(getreg(a:name, 0, 1))) + call assert_equal(a:expr, getreg(a:name, 1)) + call assert_equal(a:exprstr, string(getreg(a:name, 1, 1))) + endfunc + + func Test_let_register() + let @" = 'abc' + call Assert_reg('"', 'v', "abc", "['abc']", "abc", "['abc']") + let @" = "abc\n" + call Assert_reg('"', 'V', "abc\n", "['abc']", "abc\n", "['abc']") + let @" = "abc\" + call Assert_reg('"', 'V', "abc\r\n", "['abc\r']", "abc\r\n", "['abc\r']") + let @= = '"abc"' + call Assert_reg('=', 'v', "abc", "['abc']", '"abc"', "['\"abc\"']") + endfunc + + func Assert_regput(name, result) + new + execute "silent normal! o==\n==\e\"" . a:name . "P" + call assert_equal(a:result, getline(2, line('$'))) + endfunc + + + func Test_setreg_basic() + call setreg('a', 'abcA', 'c') + call Assert_reg('a', 'v', "abcA", "['abcA']", "abcA", "['abcA']") + call Assert_regput('a', ['==', '=abcA=']) + + call setreg('A', 'abcAc', 'c') + call Assert_reg('A', 'v', "abcAabcAc", "['abcAabcAc']", "abcAabcAc", "['abcAabcAc']") + call Assert_regput('a', ['==', '=abcAabcAc=']) + + call setreg('A', 'abcAl', 'l') + call Assert_reg('A', 'V', "abcAabcAcabcAl\n", "['abcAabcAcabcAl']", "abcAabcAcabcAl\n", "['abcAabcAcabcAl']") + call Assert_regput('a', ['==', 'abcAabcAcabcAl', '==']) + + call setreg('A', 'abcAc2','c') + call Assert_reg('A', 'v', "abcAabcAcabcAl\nabcAc2", "['abcAabcAcabcAl', 'abcAc2']", "abcAabcAcabcAl\nabcAc2", "['abcAabcAcabcAl', 'abcAc2']") + call Assert_regput('a', ['==', '=abcAabcAcabcAl', 'abcAc2=']) + + call setreg('b', 'abcB', 'v') + call Assert_reg('b', 'v', "abcB", "['abcB']", "abcB", "['abcB']") + call Assert_regput('b', ['==', '=abcB=']) + + call setreg('b', 'abcBc', 'ca') + call Assert_reg('b', 'v', "abcBabcBc", "['abcBabcBc']", "abcBabcBc", "['abcBabcBc']") + call Assert_regput('b', ['==', '=abcBabcBc=']) + + call setreg('b', 'abcBb', 'ba') + call Assert_reg('b', "\5", "abcBabcBcabcBb", "['abcBabcBcabcBb']", "abcBabcBcabcBb", "['abcBabcBcabcBb']") + call Assert_regput('b', ['==', '=abcBabcBcabcBb=']) + + call setreg('b', 'abcBc2','ca') + call Assert_reg('b', "v", "abcBabcBcabcBb\nabcBc2", "['abcBabcBcabcBb', 'abcBc2']", "abcBabcBcabcBb\nabcBc2", "['abcBabcBcabcBb', 'abcBc2']") + call Assert_regput('b', ['==', '=abcBabcBcabcBb', 'abcBc2=']) + + call setreg('b', 'abcBb2','b50a') + call Assert_reg('b', "\50", "abcBabcBcabcBb\nabcBc2abcBb2", "['abcBabcBcabcBb', 'abcBc2abcBb2']", "abcBabcBcabcBb\nabcBc2abcBb2", "['abcBabcBcabcBb', 'abcBc2abcBb2']") + call Assert_regput('b', ['==', '=abcBabcBcabcBb =', ' abcBc2abcBb2']) + + call setreg('c', 'abcC', 'l') + call Assert_reg('c', 'V', "abcC\n", "['abcC']", "abcC\n", "['abcC']") + call Assert_regput('c', ['==', 'abcC', '==']) + + call setreg('C', 'abcCl', 'l') + call Assert_reg('C', 'V', "abcC\nabcCl\n", "['abcC', 'abcCl']", "abcC\nabcCl\n", "['abcC', 'abcCl']") + call Assert_regput('c', ['==', 'abcC', 'abcCl', '==']) + + call setreg('C', 'abcCc', 'c') + call Assert_reg('C', 'v', "abcC\nabcCl\nabcCc", "['abcC', 'abcCl', 'abcCc']", "abcC\nabcCl\nabcCc", "['abcC', 'abcCl', 'abcCc']") + call Assert_regput('c', ['==', '=abcC', 'abcCl', 'abcCc=']) + + call setreg('d', 'abcD', 'V') + call Assert_reg('d', 'V', "abcD\n", "['abcD']", "abcD\n", "['abcD']") + call Assert_regput('d', ['==', 'abcD', '==']) + + call setreg('D', 'abcDb', 'b') + call Assert_reg('d', "\5", "abcD\nabcDb", "['abcD', 'abcDb']", "abcD\nabcDb", "['abcD', 'abcDb']") + call Assert_regput('d', ['==', '=abcD =', ' abcDb']) + + call setreg('e', 'abcE', 'b') + call Assert_reg('e', "\4", "abcE", "['abcE']", "abcE", "['abcE']") + call Assert_regput('e', ['==', '=abcE=']) + + call setreg('E', 'abcEb', 'b') + call Assert_reg('E', "\5", "abcE\nabcEb", "['abcE', 'abcEb']", "abcE\nabcEb", "['abcE', 'abcEb']") + call Assert_regput('e', ['==', '=abcE =', ' abcEb']) + + call setreg('E', 'abcEl', 'l') + call Assert_reg('E', "V", "abcE\nabcEb\nabcEl\n", "['abcE', 'abcEb', 'abcEl']", "abcE\nabcEb\nabcEl\n", "['abcE', 'abcEb', 'abcEl']") + call Assert_regput('e', ['==', 'abcE', 'abcEb', 'abcEl', '==']) + + call setreg('f', 'abcF', "\") + call Assert_reg('f', "\4", "abcF", "['abcF']", "abcF", "['abcF']") + call Assert_regput('f', ['==', '=abcF=']) + + call setreg('F', 'abcFc', 'c') + call Assert_reg('F', "v", "abcF\nabcFc", "['abcF', 'abcFc']", "abcF\nabcFc", "['abcF', 'abcFc']") + call Assert_regput('f', ['==', '=abcF', 'abcFc=']) + + call setreg('g', 'abcG', 'b10') + call Assert_reg('g', "\10", "abcG", "['abcG']", "abcG", "['abcG']") + call Assert_regput('g', ['==', '=abcG =']) + + call setreg('h', 'abcH', "\10") + call Assert_reg('h', "\10", "abcH", "['abcH']", "abcH", "['abcH']") + call Assert_regput('h', ['==', '=abcH =']) + + call setreg('I', 'abcI') + call Assert_reg('I', "v", "abcI", "['abcI']", "abcI", "['abcI']") + call Assert_regput('I', ['==', '=abcI=']) + endfunc + + func Test_setreg_append_NL() + endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.0596/src/version.c 2020-04-18 20:51:37.353348315 +0200 --- src/version.c 2020-04-18 21:06:37.348787451 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 597, /**/ -- "You're fired." (1980) "You're laid off." (1985) "You're downsized." (1990) "You're rightsized." (1992) (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///