# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1587240004 -7200
# Node ID 0da696bd735261ee52705110e666859410e61ebc
# Parent  7183cb9ca1805ec1c8d7b4b59f2dd5de53e97546
patch 8.2.0597: test_eval is old style

Commit: https://github.com/vim/vim/commit/90455cfa87f84f16179c19241b034abbfa8b3c9a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Apr 18 21:56:38 2020 +0200

    patch 8.2.0597: test_eval is old style

    Problem:    Test_eval is old style.
    Solution:   Change some tests to a new style test.

diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -36,44 +36,6 @@ endfun
     endtry
 endfun
 :fun Test()
-$put ='{{{1 let tests'
-let @" = 'abc'
-AR "
-let @" = "abc\n"
-AR "
-let @" = "abc\<C-m>"
-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', "\<C-v>")
-call SetReg('g', 'abcG', 'b10')
-call SetReg('h', 'abcH', "\<C-v>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')
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index ae15c9be80664a86a9eef8c9ee912c8658d37086..cb7c85e254424dccda4ff03df0a4d11b3655bbfa
GIT binary patch
literal 7988
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
Wr9bE`+LAlC|8CLNY>E~^1pN&ruzJe?

diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -235,4 +235,124 @@ func Test_numbersize()
   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\<C-m>"
+  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', "\<C-V>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', "\<C-V>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', "\<C-V>5", "abcD\nabcDb", "['abcD', 'abcDb']", "abcD\nabcDb", "['abcD', 'abcDb']")
+  call Assert_regput('d', ['==', '=abcD =', ' abcDb'])
+
+  call setreg('e', 'abcE', 'b')
+  call Assert_reg('e', "\<C-V>4", "abcE", "['abcE']", "abcE", "['abcE']")
+  call Assert_regput('e', ['==', '=abcE='])
+
+  call setreg('E', 'abcEb', 'b')
+  call Assert_reg('E', "\<C-V>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', "\<C-v>")
+  call Assert_reg('f', "\<C-V>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', "\<C-V>10", "abcG", "['abcG']", "abcG", "['abcG']")
+  call Assert_regput('g', ['==', '=abcG      ='])
+
+  call setreg('h', 'abcH', "\<C-v>10")
+  call Assert_reg('h', "\<C-V>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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    597,
+/**/
     596,
 /**/
     595,