commit 9830938e77b0d36d65b0c31eadf09f7b9d394c29
author Bram Moolenaar <Bram@vim.org> Sun Sep 27 21:58:45 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Sep 27 21:58:45 2020 +0200
tree d72efe40291ae7f94c1b95cb542478d38b17bb67
parent 06f9c6940a88d132c85eb2a1b5034fa7653518ce

patch 8.2.1765: Vim9: some tests use "var var"

Problem:    Vim9: some tests use "var var".
Solution:   Use "var name". (closes #7032)

src/testdir/test_vim9_expr.vim

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index deb1fbd..d9babed 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -68,55 +68,55 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 1
+      var name = 1
       		? 'yes'
 		: 'no'
-      assert_equal('yes', var)
+      assert_equal('yes', name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:false
+      var name = v:false
       		? 'yes'
 		: 'no'
-      assert_equal('no', var)
+      assert_equal('no', name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:false ?
+      var name = v:false ?
       		'yes' :
 		'no'
-      assert_equal('no', var)
+      assert_equal('no', name)
   END
   CheckScriptSuccess(lines)
 
   # check white space
   lines =<< trim END
       vim9script
-      var var = v:true?1:2
+      var name = v:true?1:2
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true? 1 : 2
+      var name = v:true? 1 : 2
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true ?1 : 2
+      var name = v:true ?1 : 2
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true ? 1: 2
+      var name = v:true ? 1: 2
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true ? 1 :2
+      var name = v:true ? 1 :2
   END
   CheckScriptFailure(lines, 'E1004:', 2)
 
@@ -203,44 +203,44 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 0
+      var name = 0
       		|| 1
-      assert_equal(1, var)
+      assert_equal(1, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:false
+      var name = v:false
       		|| v:true
       		|| v:false
-      assert_equal(v:true, var)
+      assert_equal(v:true, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:false ||
+      var name = v:false ||
       		v:true ||
 		v:false
-      assert_equal(v:true, var)
+      assert_equal(v:true, name)
   END
   CheckScriptSuccess(lines)
 
   # check white space
   lines =<< trim END
       vim9script
-      var var = v:true||v:true
+      var name = v:true||v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true ||v:true
+      var name = v:true ||v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true|| v:true
+      var name = v:true|| v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
 
@@ -324,44 +324,44 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 0
+      var name = 0
       		&& 1
-      assert_equal(0, var)
+      assert_equal(0, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:true
+      var name = v:true
       		&& v:true
       		&& v:true
-      assert_equal(v:true, var)
+      assert_equal(v:true, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = v:true &&
+      var name = v:true &&
       		v:true &&
       		v:true
-      assert_equal(v:true, var)
+      assert_equal(v:true, name)
   END
   CheckScriptSuccess(lines)
 
   # check white space
   lines =<< trim END
       vim9script
-      var var = v:true&&v:true
+      var name = v:true&&v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true &&v:true
+      var name = v:true &&v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
   lines =<< trim END
       vim9script
-      var var = v:true&& v:true
+      var name = v:true&& v:true
   END
   CheckScriptFailure(lines, 'E1004:', 2)
 
@@ -738,25 +738,25 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 0
+      var name = 0
       		< 1
-      assert_equal(true, var)
+      assert_equal(true, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 123
+      var name = 123
       		!= 123
-      assert_equal(false, var)
+      assert_equal(false, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 123 ==
+      var name = 123 ==
       			123
-      assert_equal(true, var)
+      assert_equal(true, name)
   END
   CheckScriptSuccess(lines)
 
@@ -988,27 +988,27 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 11
+      var name = 11
       		+ 77
 		- 22
-      assert_equal(66, var)
+      assert_equal(66, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 11 +
+      var name = 11 +
 		  77 -
 		  22
-      assert_equal(66, var)
+      assert_equal(66, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 'one'
+      var name = 'one'
       		.. 'two'
-      assert_equal('onetwo', var)
+      assert_equal('onetwo', name)
   END
   CheckScriptSuccess(lines)
 
@@ -1235,27 +1235,27 @@
   # check line continuation
   var lines =<< trim END
       vim9script
-      var var = 11
+      var name = 11
       		* 22
 		/ 3
-      assert_equal(80, var)
+      assert_equal(80, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 25
+      var name = 25
       		% 10
-      assert_equal(5, var)
+      assert_equal(5, name)
   END
   CheckScriptSuccess(lines)
 
   lines =<< trim END
       vim9script
-      var var = 11 *
+      var name = 11 *
       		22 /
 		3
-      assert_equal(80, var)
+      assert_equal(80, name)
   END
   CheckScriptSuccess(lines)