Mercurial > vim

diff src/testdir/test_vim9_expr.vim @ 20170:0612c64a2b87 v8.2.0640

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0640: Vim9: expanding does not work Commit: https://github.com/vim/vim/commit/cfe435d7feacf123ac060747b885f7c4328062ea Author: Bram Moolenaar <Bram@vim.org> Date: Sat Apr 25 20:02:55 2020 +0200 patch 8.2.0640: Vim9: expanding does not work Problem: Vim9: expanding does not work. Solution: Find wildcards in not compiled commands. Reorganize test files.
author Bram Moolenaar <Bram@vim.org>
date Sat, 25 Apr 2020 20:15:03 +0200
parents 7fc5d62fe2a5
children 63cc54100ae4
line wrap: on
line diff
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1,33 +1,7 @@
 " Tests for Vim9 script expressions
 
 source check.vim
-
-" Check that "line" inside ":def" results in an "error" message.
-func CheckDefFailure(line, error)
-  call writefile(['def! Func()', a:line, 'enddef'], 'Xdef')
-  call assert_fails('so Xdef', a:error, a:line)
-  call delete('Xdef')
-endfunc
-
-func CheckDefFailureMult(lines, error)
-  call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef')
-  call assert_fails('so Xdef', a:error, join(a:lines, ' | '))
-  call delete('Xdef')
-endfunc
-
-" Check that "line" inside ":def" results in an "error" message when executed.
-func CheckDefExecFailure(line, error)
-  call writefile(['def! Func()', a:line, 'enddef'], 'Xdef')
-  so Xdef
-  call assert_fails('call Func()', a:error, a:line)
-  call delete('Xdef')
-endfunc
-
-func CheckDefFailureList(lines, error)
-  call writefile(['def! Func()'] + a:lines + ['enddef'], 'Xdef')
-  call assert_fails('so Xdef', a:error, string(a:lines))
-  call delete('Xdef')
-endfunc
+source vim9.vim
 
 " test cond ? expr : expr
 def Test_expr1()
@@ -59,18 +33,18 @@ def Test_expr1()
 enddef
 
 func Test_expr1_fails()
-  call CheckDefFailure("let x = 1 ? 'one'", "Missing ':' after '?'")
-  call CheckDefFailure("let x = 1 ? 'one' : xxx", "E1001:")
+  call CheckDefFailure(["let x = 1 ? 'one'"], "Missing ':' after '?'")
+  call CheckDefFailure(["let x = 1 ? 'one' : xxx"], "E1001:")
 
   let msg = "white space required before and after '?'"
-  call CheckDefFailure("let x = 1? 'one' : 'two'", msg)
-  call CheckDefFailure("let x = 1 ?'one' : 'two'", msg)
-  call CheckDefFailure("let x = 1?'one' : 'two'", msg)
+  call CheckDefFailure(["let x = 1? 'one' : 'two'"], msg)
+  call CheckDefFailure(["let x = 1 ?'one' : 'two'"], msg)
+  call CheckDefFailure(["let x = 1?'one' : 'two'"], msg)
 
   let msg = "white space required before and after ':'"
-  call CheckDefFailure("let x = 1 ? 'one': 'two'", msg)
-  call CheckDefFailure("let x = 1 ? 'one' :'two'", msg)
-  call CheckDefFailure("let x = 1 ? 'one':'two'", msg)
+  call CheckDefFailure(["let x = 1 ? 'one': 'two'"], msg)
+  call CheckDefFailure(["let x = 1 ? 'one' :'two'"], msg)
+  call CheckDefFailure(["let x = 1 ? 'one':'two'"], msg)
 endfunc
 
 " TODO: define inside test function
@@ -107,11 +81,11 @@ enddef
 
 func Test_expr2_fails()
   let msg = "white space required before and after '||'"
-  call CheckDefFailure("let x = 1||2", msg)
-  call CheckDefFailure("let x = 1 ||2", msg)
-  call CheckDefFailure("let x = 1|| 2", msg)
+  call CheckDefFailure(["let x = 1||2"], msg)
+  call CheckDefFailure(["let x = 1 ||2"], msg)
+  call CheckDefFailure(["let x = 1|| 2"], msg)
 
-  call CheckDefFailure("let x = 1 || xxx", 'E1001:')
+  call CheckDefFailure(["let x = 1 || xxx"], 'E1001:')
 endfunc
 
 " test &&
@@ -148,9 +122,9 @@ enddef
 
 func Test_expr3_fails()
   let msg = "white space required before and after '&&'"
-  call CheckDefFailure("let x = 1&&2", msg)
-  call CheckDefFailure("let x = 1 &&2", msg)
-  call CheckDefFailure("let x = 1&& 2", msg)
+  call CheckDefFailure(["let x = 1&&2"], msg)
+  call CheckDefFailure(["let x = 1 &&2"], msg)
+  call CheckDefFailure(["let x = 1&& 2"], msg)
 endfunc
 
 let atrue = v:true
@@ -212,7 +186,7 @@ def Test_expr4_equal()
   assert_equal(false, 'abc' ==# 'ABC')
   set noignorecase
 
-  call CheckDefFailure("let x = 'a' == xxx", 'E1001:')
+  call CheckDefFailure(["let x = 'a' == xxx"], 'E1001:')
 
   assert_equal(true, 0z3f == 0z3f)
   assert_equal(false, 0z3f == 0z4f)
@@ -413,71 +387,71 @@ enddef
 
 func Test_expr4_fails()
   let msg = "white space required before and after '>'"
-  call CheckDefFailure("let x = 1>2", msg)
-  call CheckDefFailure("let x = 1 >2", msg)
-  call CheckDefFailure("let x = 1> 2", msg)
+  call CheckDefFailure(["let x = 1>2"], msg)
+  call CheckDefFailure(["let x = 1 >2"], msg)
+  call CheckDefFailure(["let x = 1> 2"], msg)
 
   let msg = "white space required before and after '=='"
-  call CheckDefFailure("let x = 1==2", msg)
-  call CheckDefFailure("let x = 1 ==2", msg)
-  call CheckDefFailure("let x = 1== 2", msg)
+  call CheckDefFailure(["let x = 1==2"], msg)
+  call CheckDefFailure(["let x = 1 ==2"], msg)
+  call CheckDefFailure(["let x = 1== 2"], msg)
 
   let msg = "white space required before and after 'is'"
-  call CheckDefFailure("let x = '1'is'2'", msg)
-  call CheckDefFailure("let x = '1' is'2'", msg)
-  call CheckDefFailure("let x = '1'is '2'", msg)
+  call CheckDefFailure(["let x = '1'is'2'"], msg)
+  call CheckDefFailure(["let x = '1' is'2'"], msg)
+  call CheckDefFailure(["let x = '1'is '2'"], msg)
 
   let msg = "white space required before and after 'isnot'"
-  call CheckDefFailure("let x = '1'isnot'2'", msg)
-  call CheckDefFailure("let x = '1' isnot'2'", msg)
-  call CheckDefFailure("let x = '1'isnot '2'", msg)
+  call CheckDefFailure(["let x = '1'isnot'2'"], msg)
+  call CheckDefFailure(["let x = '1' isnot'2'"], msg)
+  call CheckDefFailure(["let x = '1'isnot '2'"], msg)
 
-  call CheckDefFailure("let x = 1 is# 2", 'E15:')
-  call CheckDefFailure("let x = 1 is? 2", 'E15:')
-  call CheckDefFailure("let x = 1 isnot# 2", 'E15:')
-  call CheckDefFailure("let x = 1 isnot? 2", 'E15:')
+  call CheckDefFailure(["let x = 1 is# 2"], 'E15:')
+  call CheckDefFailure(["let x = 1 is? 2"], 'E15:')
+  call CheckDefFailure(["let x = 1 isnot# 2"], 'E15:')
+  call CheckDefFailure(["let x = 1 isnot? 2"], 'E15:')
 
-  call CheckDefFailure("let x = 1 == '2'", 'Cannot compare number with string')
-  call CheckDefFailure("let x = '1' == 2", 'Cannot compare string with number')
-  call CheckDefFailure("let x = 1 == RetVoid()", 'Cannot use void value')
-  call CheckDefFailure("let x = RetVoid() == 1", 'Cannot compare void with number')
+  call CheckDefFailure(["let x = 1 == '2'"], 'Cannot compare number with string')
+  call CheckDefFailure(["let x = '1' == 2"], 'Cannot compare string with number')
+  call CheckDefFailure(["let x = 1 == RetVoid()"], 'Cannot use void value')
+  call CheckDefFailure(["let x = RetVoid() == 1"], 'Cannot compare void with number')
 
-  call CheckDefFailure("let x = true > false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true >= false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true < false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true <= false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true =~ false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true !~ false", 'Cannot compare bool with bool')
-  call CheckDefFailure("let x = true is false", 'Cannot use "is" with bool')
-  call CheckDefFailure("let x = true isnot false", 'Cannot use "isnot" with bool')
+  call CheckDefFailure(["let x = true > false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true >= false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true < false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true <= false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true =~ false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true !~ false"], 'Cannot compare bool with bool')
+  call CheckDefFailure(["let x = true is false"], 'Cannot use "is" with bool')
+  call CheckDefFailure(["let x = true isnot false"], 'Cannot use "isnot" with bool')
 
-  call CheckDefFailure("let x = v:none is v:null", 'Cannot use "is" with special')
-  call CheckDefFailure("let x = v:none isnot v:null", 'Cannot use "isnot" with special')
-  call CheckDefFailure("let x = 123 is 123", 'Cannot use "is" with number')
-  call CheckDefFailure("let x = 123 isnot 123", 'Cannot use "isnot" with number')
+  call CheckDefFailure(["let x = v:none is v:null"], 'Cannot use "is" with special')
+  call CheckDefFailure(["let x = v:none isnot v:null"], 'Cannot use "isnot" with special')
+  call CheckDefFailure(["let x = 123 is 123"], 'Cannot use "is" with number')
+  call CheckDefFailure(["let x = 123 isnot 123"], 'Cannot use "isnot" with number')
   if has('float')
-    call CheckDefFailure("let x = 1.3 is 1.3", 'Cannot use "is" with float')
-    call CheckDefFailure("let x = 1.3 isnot 1.3", 'Cannot use "isnot" with float')
+    call CheckDefFailure(["let x = 1.3 is 1.3"], 'Cannot use "is" with float')
+    call CheckDefFailure(["let x = 1.3 isnot 1.3"], 'Cannot use "isnot" with float')
   endif
 
-  call CheckDefFailure("let x = 0za1 > 0z34", 'Cannot compare blob with blob')
-  call CheckDefFailure("let x = 0za1 >= 0z34", 'Cannot compare blob with blob')
-  call CheckDefFailure("let x = 0za1 < 0z34", 'Cannot compare blob with blob')
-  call CheckDefFailure("let x = 0za1 <= 0z34", 'Cannot compare blob with blob')
-  call CheckDefFailure("let x = 0za1 =~ 0z34", 'Cannot compare blob with blob')
-  call CheckDefFailure("let x = 0za1 !~ 0z34", 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 > 0z34"], 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 >= 0z34"], 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 < 0z34"], 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 <= 0z34"], 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 =~ 0z34"], 'Cannot compare blob with blob')
+  call CheckDefFailure(["let x = 0za1 !~ 0z34"], 'Cannot compare blob with blob')
 
-  call CheckDefFailure("let x = [13] > [88]", 'Cannot compare list with list')
-  call CheckDefFailure("let x = [13] >= [88]", 'Cannot compare list with list')
-  call CheckDefFailure("let x = [13] < [88]", 'Cannot compare list with list')
-  call CheckDefFailure("let x = [13] <= [88]", 'Cannot compare list with list')
-  call CheckDefFailure("let x = [13] =~ [88]", 'Cannot compare list with list')
-  call CheckDefFailure("let x = [13] !~ [88]", 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] > [88]"], 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] >= [88]"], 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] < [88]"], 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] <= [88]"], 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] =~ [88]"], 'Cannot compare list with list')
+  call CheckDefFailure(["let x = [13] !~ [88]"], 'Cannot compare list with list')
 
-  call CheckDefFailureMult(['let j: job', 'let chan: channel', 'let r = j == chan'], 'Cannot compare job with channel')
-  call CheckDefFailureMult(['let j: job', 'let x: list<any>', 'let r = j == x'], 'Cannot compare job with list')
-  call CheckDefFailureMult(['let j: job', 'let Xx: func', 'let r = j == Xx'], 'Cannot compare job with func')
-  call CheckDefFailureMult(['let j: job', 'let Xx: func', 'let r = j == Xx'], 'Cannot compare job with func')
+  call CheckDefFailure(['let j: job', 'let chan: channel', 'let r = j == chan'], 'Cannot compare job with channel')
+  call CheckDefFailure(['let j: job', 'let x: list<any>', 'let r = j == x'], 'Cannot compare job with list')
+  call CheckDefFailure(['let j: job', 'let Xx: func', 'let r = j == Xx'], 'Cannot compare job with func')
+  call CheckDefFailure(['let j: job', 'let Xx: func', 'let r = j == Xx'], 'Cannot compare job with func')
 endfunc
 
 " test addition, subtraction, concatenation
@@ -532,27 +506,27 @@ enddef
 
 func Test_expr5_fails()
   let msg = "white space required before and after '+'"
-  call CheckDefFailure("let x = 1+2", msg)
-  call CheckDefFailure("let x = 1 +2", msg)
-  call CheckDefFailure("let x = 1+ 2", msg)
+  call CheckDefFailure(["let x = 1+2"], msg)
+  call CheckDefFailure(["let x = 1 +2"], msg)
+  call CheckDefFailure(["let x = 1+ 2"], msg)
 
   let msg = "white space required before and after '-'"
-  call CheckDefFailure("let x = 1-2", msg)
-  call CheckDefFailure("let x = 1 -2", msg)
-  call CheckDefFailure("let x = 1- 2", msg)
+  call CheckDefFailure(["let x = 1-2"], msg)
+  call CheckDefFailure(["let x = 1 -2"], msg)
+  call CheckDefFailure(["let x = 1- 2"], msg)
 
   let msg = "white space required before and after '..'"
-  call CheckDefFailure("let x = '1'..'2'", msg)
-  call CheckDefFailure("let x = '1' ..'2'", msg)
-  call CheckDefFailure("let x = '1'.. '2'", msg)
+  call CheckDefFailure(["let x = '1'..'2'"], msg)
+  call CheckDefFailure(["let x = '1' ..'2'"], msg)
+  call CheckDefFailure(["let x = '1'.. '2'"], msg)
 
-  call CheckDefFailure("let x = 0z1122 + 33", 'E1035')
-  call CheckDefFailure("let x = 0z1122 + [3]", 'E1035')
-  call CheckDefFailure("let x = 0z1122 + 'asd'", 'E1035')
-  call CheckDefFailure("let x = 33 + 0z1122", 'E1035')
-  call CheckDefFailure("let x = [3] + 0z1122", 'E1035')
-  call CheckDefFailure("let x = 'asdf' + 0z1122", 'E1035')
-  call CheckDefFailure("let x = 6 + xxx", 'E1001')
+  call CheckDefFailure(["let x = 0z1122 + 33"], 'E1035')
+  call CheckDefFailure(["let x = 0z1122 + [3]"], 'E1035')
+  call CheckDefFailure(["let x = 0z1122 + 'asd'"], 'E1035')
+  call CheckDefFailure(["let x = 33 + 0z1122"], 'E1035')
+  call CheckDefFailure(["let x = [3] + 0z1122"], 'E1035')
+  call CheckDefFailure(["let x = 'asdf' + 0z1122"], 'E1035')
+  call CheckDefFailure(["let x = 6 + xxx"], 'E1001')
 endfunc
 
 " test multiply, divide, modulo
@@ -588,7 +562,7 @@ def Test_expr6()
     assert_equal(6.0, xf[0] * yf[0])
   endif
 
-  call CheckDefFailure("let x = 6 * xxx", 'E1001')
+  call CheckDefFailure(["let x = 6 * xxx"], 'E1001')
 enddef
 
 def Test_expr6_float()
@@ -623,45 +597,45 @@ enddef
 
 func Test_expr6_fails()
   let msg = "white space required before and after '*'"
-  call CheckDefFailure("let x = 1*2", msg)
-  call CheckDefFailure("let x = 1 *2", msg)
-  call CheckDefFailure("let x = 1* 2", msg)
+  call CheckDefFailure(["let x = 1*2"], msg)
+  call CheckDefFailure(["let x = 1 *2"], msg)
+  call CheckDefFailure(["let x = 1* 2"], msg)
 
   let msg = "white space required before and after '/'"
-  call CheckDefFailure("let x = 1/2", msg)
-  call CheckDefFailure("let x = 1 /2", msg)
-  call CheckDefFailure("let x = 1/ 2", msg)
+  call CheckDefFailure(["let x = 1/2"], msg)
+  call CheckDefFailure(["let x = 1 /2"], msg)
+  call CheckDefFailure(["let x = 1/ 2"], msg)
 
   let msg = "white space required before and after '%'"
-  call CheckDefFailure("let x = 1%2", msg)
-  call CheckDefFailure("let x = 1 %2", msg)
-  call CheckDefFailure("let x = 1% 2", msg)
+  call CheckDefFailure(["let x = 1%2"], msg)
+  call CheckDefFailure(["let x = 1 %2"], msg)
+  call CheckDefFailure(["let x = 1% 2"], msg)
 
-  call CheckDefFailure("let x = '1' * '2'", 'E1036:')
-  call CheckDefFailure("let x = '1' / '2'", 'E1036:')
-  call CheckDefFailure("let x = '1' % '2'", 'E1035:')
+  call CheckDefFailure(["let x = '1' * '2'"], 'E1036:')
+  call CheckDefFailure(["let x = '1' / '2'"], 'E1036:')
+  call CheckDefFailure(["let x = '1' % '2'"], 'E1035:')
 
-  call CheckDefFailure("let x = 0z01 * 0z12", 'E1036:')
-  call CheckDefFailure("let x = 0z01 / 0z12", 'E1036:')
-  call CheckDefFailure("let x = 0z01 % 0z12", 'E1035:')
+  call CheckDefFailure(["let x = 0z01 * 0z12"], 'E1036:')
+  call CheckDefFailure(["let x = 0z01 / 0z12"], 'E1036:')
+  call CheckDefFailure(["let x = 0z01 % 0z12"], 'E1035:')
 
-  call CheckDefFailure("let x = [1] * [2]", 'E1036:')
-  call CheckDefFailure("let x = [1] / [2]", 'E1036:')
-  call CheckDefFailure("let x = [1] % [2]", 'E1035:')
+  call CheckDefFailure(["let x = [1] * [2]"], 'E1036:')
+  call CheckDefFailure(["let x = [1] / [2]"], 'E1036:')
+  call CheckDefFailure(["let x = [1] % [2]"], 'E1035:')
 
-  call CheckDefFailure("let x = #{one: 1} * #{two: 2}", 'E1036:')
-  call CheckDefFailure("let x = #{one: 1} / #{two: 2}", 'E1036:')
-  call CheckDefFailure("let x = #{one: 1} % #{two: 2}", 'E1035:')
+  call CheckDefFailure(["let x = #{one: 1} * #{two: 2}"], 'E1036:')
+  call CheckDefFailure(["let x = #{one: 1} / #{two: 2}"], 'E1036:')
+  call CheckDefFailure(["let x = #{one: 1} % #{two: 2}"], 'E1035:')
 
-  call CheckDefFailure("let x = 0xff[1]", 'E714:')
+  call CheckDefFailure(["let x = 0xff[1]"], 'E714:')
   if has('float')
-    call CheckDefFailure("let x = 0.7[1]", 'E714:')
+    call CheckDefFailure(["let x = 0.7[1]"], 'E714:')
   endif
 endfunc
 
 func Test_expr6_float_fails()
   CheckFeature float
-  call CheckDefFailure("let x = 1.0 % 2", 'E1035:')
+  call CheckDefFailure(["let x = 1.0 % 2"], 'E1035:')
 endfunc
 
 " define here to use old style parsing
@@ -721,7 +695,7 @@ def Test_expr7_blob()
   assert_equal(g:blob_one, 0z01)
   assert_equal(g:blob_long, 0z0102.0304)
 
-  call CheckDefFailure("let x = 0z123", 'E973:')
+  call CheckDefFailure(["let x = 0z123"], 'E973:')
 enddef
 
 def Test_expr7_string()
@@ -734,16 +708,16 @@ def Test_expr7_string()
   assert_equal(g:string_long, "abcdefghijklm")
   assert_equal(g:string_special, "ab\ncd\ref\ekk")
 
-  call CheckDefFailure('let x = "abc', 'E114:')
-  call CheckDefFailure("let x = 'abc", 'E115:')
+  call CheckDefFailure(['let x = "abc'], 'E114:')
+  call CheckDefFailure(["let x = 'abc"], 'E115:')
 enddef
 
 def Test_expr7_vimvar()
   let old: list<string> = v:oldfiles
   let compl: dict<any> = v:completed_item
 
-  call CheckDefFailure("let old: list<number> = v:oldfiles", 'E1013: type mismatch, expected list<number> but got list<string>')
-  call CheckDefFailure("let old: dict<number> = v:completed_item", 'E1013: type mismatch, expected dict<number> but got dict<any>')
+  call CheckDefFailure(["let old: list<number> = v:oldfiles"], 'E1013: type mismatch, expected list<number> but got list<string>')
+  call CheckDefFailure(["let old: dict<number> = v:completed_item"], 'E1013: type mismatch, expected dict<number> but got dict<any>')
 enddef
 
 def Test_expr7_special()
@@ -755,11 +729,11 @@ def Test_expr7_special()
   assert_equal(g:special_null, v:null)
   assert_equal(g:special_none, v:none)
 
-  call CheckDefFailure('v:true = true', 'E46:')
-  call CheckDefFailure('v:true = false', 'E46:')
-  call CheckDefFailure('v:false = true', 'E46:')
-  call CheckDefFailure('v:null = 11', 'E46:')
-  call CheckDefFailure('v:none = 22', 'E46:')
+  call CheckDefFailure(['v:true = true'], 'E46:')
+  call CheckDefFailure(['v:true = false'], 'E46:')
+  call CheckDefFailure(['v:false = true'], 'E46:')
+  call CheckDefFailure(['v:null = 11'], 'E46:')
+  call CheckDefFailure(['v:none = 22'], 'E46:')
 enddef
 
 def Test_expr7_list()
@@ -770,9 +744,9 @@ def Test_expr7_list()
   assert_equal('b', g:list_mixed[1])
 
   call CheckDefExecFailure("let x = g:anint[3]", 'E714:')
-  call CheckDefFailure("let x = g:list_mixed[xxx]", 'E1001:')
+  call CheckDefFailure(["let x = g:list_mixed[xxx]"], 'E1001:')
   call CheckDefExecFailure("let x = g:list_mixed['xx']", 'E39:')
-  call CheckDefFailure("let x = g:list_mixed[0", 'E111:')
+  call CheckDefFailure(["let x = g:list_mixed[0"], 'E111:')
   call CheckDefExecFailure("let x = g:list_empty[3]", 'E684:')
 enddef
 
@@ -792,16 +766,16 @@ def Test_expr7_dict()
   let val = 1
   assert_equal(g:dict_one, {key: val})
 
-  call CheckDefFailure("let x = #{8: 8}", 'E1014:')
-  call CheckDefFailure("let x = #{xxx}", 'E720:')
-  call CheckDefFailureMult(["let x = #{xxx: 1", "let y = 2"], 'E722:')
-  call CheckDefFailure("let x = #{xxx: 1,", 'E723:')
-  call CheckDefFailure("let x = {'a': xxx}", 'E1001:')
-  call CheckDefFailure("let x = {xxx: 8}", 'E1001:')
-  call CheckDefFailure("let x = #{a: 1, a: 2}", 'E721:')
-  call CheckDefFailure("let x = #", 'E1015:')
-  call CheckDefFailure("let x += 1", 'E1020:')
-  call CheckDefFailure("let x = x + 1", 'E1001:')
+  call CheckDefFailure(["let x = #{8: 8}"], 'E1014:')
+  call CheckDefFailure(["let x = #{xxx}"], 'E720:')
+  call CheckDefFailure(["let x = #{xxx: 1", "let y = 2"], 'E722:')
+  call CheckDefFailure(["let x = #{xxx: 1,"], 'E723:')
+  call CheckDefFailure(["let x = {'a': xxx}"], 'E1001:')
+  call CheckDefFailure(["let x = {xxx: 8}"], 'E1001:')
+  call CheckDefFailure(["let x = #{a: 1, a: 2}"], 'E721:')
+  call CheckDefFailure(["let x = #"], 'E1015:')
+  call CheckDefFailure(["let x += 1"], 'E1020:')
+  call CheckDefFailure(["let x = x + 1"], 'E1001:')
   call CheckDefExecFailure("let x = g:anint.member", 'E715:')
   call CheckDefExecFailure("let x = g:dict_empty.member", 'E716:')
 enddef
@@ -809,7 +783,7 @@ enddef
 def Test_expr_member()
   assert_equal(1, g:dict_one.one)
 
-  call CheckDefFailure("let x = g:dict_one.#$!", 'E1002:')
+  call CheckDefFailure(["let x = g:dict_one.#$!"], 'E1002:')
 enddef
 
 def Test_expr7_option()
@@ -831,7 +805,7 @@ def Test_expr7_environment()
   assert_equal('testvar', $TESTVAR)
   assert_equal('', $ASDF_ASD_XXX)
 
-  call CheckDefFailure("let x = $$$", 'E1002:')
+  call CheckDefFailure(["let x = $$$"], 'E1002:')
 enddef
 
 def Test_expr7_register()
@@ -871,7 +845,7 @@ def Test_expr7_call()
   assert_equal('yes', 'yes'->Echo())
   assert_equal('yes', 'yes'->s:EchoArg())
 
-  call CheckDefFailure("let x = 'yes'->Echo", 'E107:')
+  call CheckDefFailure(["let x = 'yes'->Echo"], 'E107:')
 enddef
 
 
@@ -904,39 +878,39 @@ def Test_expr7_not()
 enddef
 
 func Test_expr7_fails()
-  call CheckDefFailure("let x = (12", "E110:")
+  call CheckDefFailure(["let x = (12"], "E110:")
 
-  call CheckDefFailure("let x = -'xx'", "E1030:")
-  call CheckDefFailure("let x = +'xx'", "E1030:")
-  call CheckDefFailure("let x = -0z12", "E974:")
+  call CheckDefFailure(["let x = -'xx'"], "E1030:")
+  call CheckDefFailure(["let x = +'xx'"], "E1030:")
+  call CheckDefFailure(["let x = -0z12"], "E974:")
   call CheckDefExecFailure("let x = -[8]", "E39:")
   call CheckDefExecFailure("let x = -{'a': 1}", "E39:")
 
-  call CheckDefFailure("let x = @", "E1002:")
-  call CheckDefFailure("let x = @<", "E354:")
+  call CheckDefFailure(["let x = @"], "E1002:")
+  call CheckDefFailure(["let x = @<"], "E354:")
 
-  call CheckDefFailure("let x = [1, 2", "E697:")
-  call CheckDefFailure("let x = [notfound]", "E1001:")
+  call CheckDefFailure(["let x = [1, 2"], "E697:")
+  call CheckDefFailure(["let x = [notfound]"], "E1001:")
 
-  call CheckDefFailure("let x = { -> 123) }", "E451:")
-  call CheckDefFailure("let x = 123->{x -> x + 5) }", "E451:")
+  call CheckDefFailure(["let x = { -> 123) }"], "E451:")
+  call CheckDefFailure(["let x = 123->{x -> x + 5) }"], "E451:")
 
-  call CheckDefFailure("let x = &notexist", 'E113:')
-  call CheckDefFailure("&grepprg = [343]", 'E1013:')
+  call CheckDefFailure(["let x = &notexist"], 'E113:')
+  call CheckDefFailure(["&grepprg = [343]"], 'E1013:')
 
   call CheckDefExecFailure("echo s:doesnt_exist", 'E121:')
   call CheckDefExecFailure("echo g:doesnt_exist", 'E121:')
 
-  call CheckDefFailure("echo a:somevar", 'E1075:')
-  call CheckDefFailure("echo l:somevar", 'E1075:')
-  call CheckDefFailure("echo x:somevar", 'E1075:')
+  call CheckDefFailure(["echo a:somevar"], 'E1075:')
+  call CheckDefFailure(["echo l:somevar"], 'E1075:')
+  call CheckDefFailure(["echo x:somevar"], 'E1075:')
 
   call CheckDefExecFailure("let x = +g:astring", 'E1030:')
   call CheckDefExecFailure("let x = +g:ablob", 'E974:')
   call CheckDefExecFailure("let x = +g:alist", 'E745:')
   call CheckDefExecFailure("let x = +g:adict", 'E728:')
 
-  call CheckDefFailureMult(["let x = ''", "let y = x.memb"], 'E715:')
+  call CheckDefFailure(["let x = ''", "let y = x.memb"], 'E715:')
 
   call CheckDefExecFailure("[1, 2->len()", 'E492:')
   call CheckDefExecFailure("#{a: 1->len()", 'E488:')
@@ -988,23 +962,23 @@ enddef
 
 
 func Test_expr7_trailing_fails()
-  call CheckDefFailureList(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
-  call CheckDefFailureList(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
+  call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)}'], 'E107')
+  call CheckDefFailure(['let l = [2]', 'l->{l -> add(l, 8)} ()'], 'E274')
 endfunc
 
 func Test_expr_fails()
-  call CheckDefFailure("let x = '1'is2", 'E488:')
-  call CheckDefFailure("let x = '1'isnot2", 'E488:')
+  call CheckDefFailure(["let x = '1'is2"], 'E488:')
+  call CheckDefFailure(["let x = '1'isnot2"], 'E488:')
 
   call CheckDefExecFailure("CallMe ('yes')", 'E492:')
-  call CheckDefFailure("CallMe2('yes','no')", 'E1069:')
-  call CheckDefFailure("CallMe2('yes' , 'no')", 'E1068:')
+  call CheckDefFailure(["CallMe2('yes','no')"], 'E1069:')
+  call CheckDefFailure(["CallMe2('yes' , 'no')"], 'E1068:')
 
-  call CheckDefFailure("v:nosuch += 3", 'E1001:')
-  call CheckDefFailure("let v:statusmsg = ''", 'E1064:')
-  call CheckDefFailure("let asdf = v:nosuch", 'E1001:')
+  call CheckDefFailure(["v:nosuch += 3"], 'E1001:')
+  call CheckDefFailure(["let v:statusmsg = ''"], 'E1064:')
+  call CheckDefFailure(["let asdf = v:nosuch"], 'E1001:')
 
-  call CheckDefFailure("echo len('asdf'", 'E110:')
-  call CheckDefFailure("echo Func0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789()", 'E1011:')
-  call CheckDefFailure("echo doesnotexist()", 'E117:')
+  call CheckDefFailure(["echo len('asdf'"], 'E110:')
+  call CheckDefFailure(["echo Func0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789()"], 'E1011:')
+  call CheckDefFailure(["echo doesnotexist()"], 'E117:')
 endfunc