thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2949: tests failing because no error for float to string conversion

Browse Source 
Problem:    Tests failing because there is no error for float to string
            conversion.
Solution:   Change the check for failure to check for correct result.  Make
            some conversions strict in Vim9 script.
This commit is contained in:
Bram Moolenaar
2021-06-06 14:14:39 +02:00
parent 7a2217bedd
commit 3cfa5b16b0
12 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_eval_stuff.vim
View File

@@ -144,7 +144,7 @@ func Test_string_concatenation()
if has('float')
let a = 'A'
let b = 1.234
call assert_fails('echo a .. b', 'E806:')
call assert_equal('A1.234', a .. b)
endif
endfunc

6
src/testdir/test_execute_func.vim
View File

@@ -2,6 +2,7 @@
source view_util.vim
source check.vim
source vim9.vim
func NestedEval()
let nested = execute('echo "nested\nlines"')
@@ -37,8 +38,9 @@ func Test_execute_string()
call assert_equal("\nsomething", execute('echo "something"', 'silent!'))
call assert_equal("", execute('burp', 'silent!'))
if has('float')
call assert_fails('call execute(3.4)', 'E806:')
call assert_fails('call execute("echo \"x\"", 3.4)', 'E806:')
call assert_fails('call execute(3.4)', 'E492:')
call assert_equal("\nx", execute("echo \"x\"", 3.4))
call CheckDefExecAndScriptFailure(['execute("echo \"x\"", 3.4)'], 'E806:')
endif
endfunc

5
src/testdir/test_float_func.vim
View File

@@ -2,6 +2,7 @@
source check.vim
CheckFeature float
source vim9.vim
func Test_abs()
call assert_equal('1.23', string(abs(1.23)))
@@ -238,7 +239,9 @@ func Test_str2float()
call assert_equal('nan', string(str2float('NaN')))
call assert_equal('nan', string(str2float(' nan ')))
call assert_fails("call str2float(1.2)", 'E806:')
call assert_equal(1.2, str2float(1.2))
call CheckDefExecFailure(['str2float(1.2)'], 'E1013:')
call CheckScriptFailure(['vim9script', 'str2float(1.2)'], 'E806:')
call assert_fails("call str2float([])", 'E730:')
call assert_fails("call str2float({})", 'E731:')
call assert_fails("call str2float(function('string'))", 'E729:')

15
src/testdir/test_functions.vim
View File

@@ -165,11 +165,13 @@ func Test_strwidth()
call assert_fails('call strwidth({->0})', 'E729:')
call assert_fails('call strwidth([])', 'E730:')
call assert_fails('call strwidth({})', 'E731:')
if has('float')
call assert_fails('call strwidth(1.2)', 'E806:')
endif
endfor
if has('float')
call assert_equal(3, strwidth(1.2))
call CheckDefExecAndScriptFailure(['echo strwidth(1.2)'], 'E806:')
endif
set ambiwidth&
endfunc
@@ -233,7 +235,9 @@ func Test_str2nr()
call assert_fails('call str2nr([])', 'E730:')
call assert_fails('call str2nr({->2})', 'E729:')
if has('float')
call assert_fails('call str2nr(1.2)', 'E806:')
call assert_equal(1, str2nr(1.2))
call CheckDefExecFailure(['echo str2nr(1.2)'], 'E1013:')
call CheckScriptFailure(['vim9script', 'echo str2nr(1.2)'], 'E806:')
endif
call assert_fails('call str2nr(10, [])', 'E745:')
endfunc
@@ -494,7 +498,8 @@ func Test_simplify()
call assert_fails('call simplify([])', 'E730:')
call assert_fails('call simplify({})', 'E731:')
if has('float')
call assert_fails('call simplify(1.2)', 'E806:')
call assert_equal('1.2', simplify(1.2))
call CheckDefExecAndScriptFailure(['echo simplify(1.2)'], 'E806:')
endif
endfunc

5
src/testdir/test_glob2regpat.vim
View File

@@ -1,8 +1,11 @@
" Test glob2regpat()
source vim9.vim
func Test_glob2regpat_invalid()
if has('float')
call assert_fails('call glob2regpat(1.33)', 'E806:')
call assert_equal('^1\.33$', glob2regpat(1.33))
call CheckDefExecAndScriptFailure(['echo glob2regpat(1.33)'], 'E806:')
endif
call assert_fails('call glob2regpat("}")', 'E219:')
call assert_fails('call glob2regpat("{")', 'E220:')

6
src/testdir/test_listdict.vim
View File

@@ -859,7 +859,7 @@ func Test_listdict_extend()
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'error')", 'E737:')
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 'xxx')", 'E475:')
if has('float')
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 1.2)", 'E806:')
call assert_fails("call extend(d, {'b': 0, 'c':'C'}, 1.2)", 'E475:')
endif
call assert_equal({'a': 'A', 'b': 'B'}, d)
@@ -1022,9 +1022,9 @@ func Test_listdict_index()
call assert_fails("let l = insert([1,2,3], 4, [])", 'E745:')
let l = [1, 2, 3]
call assert_fails("let l[i] = 3", 'E121:')
call assert_fails("let l[1.1] = 4", 'E806:')
call assert_fails("let l[1.1] = 4", 'E805:')
call assert_fails("let l[:i] = [4, 5]", 'E121:')
call assert_fails("let l[:3.2] = [4, 5]", 'E806:')
call assert_fails("let l[:3.2] = [4, 5]", 'E805:')
let t = test_unknown()
call assert_fails("echo t[0]", 'E685:')
endfunc