summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-20 23:08:34 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-20 23:08:34 +0100
commit09f28f49c9b5973593f8a9b445cdc2ed3da630b6 (patch)
tree6ab2557da4ff954065acda59e423e95f8ca47289
parent436472f5e0328dc4a635b1c344c04a62d64132ea (diff)
downloadvim-git-09f28f49c9b5973593f8a9b445cdc2ed3da630b6.tar.gz
patch 8.2.0292: Vim9: CHECKNR and CHECKTYPE instructions not testedv8.2.0292
Problem: Vim9: CHECKNR and CHECKTYPE instructions not tested. Solution: Add tests.
-rw-r--r--src/testdir/test_vim9_expr.vim5
-rw-r--r--src/testdir/test_vim9_script.vim7
-rw-r--r--src/version.c2
3 files changed, 14 insertions, 0 deletions
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index fabbd9b82..312d6338c 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -781,6 +781,11 @@ func Test_expr7_fails()
call CheckDefExecFailure("echo s:doesnt_exist", 'E121:')
call CheckDefExecFailure("echo g:doesnt_exist", 'E121:')
+
+ 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:')
endfunc
let g:Funcrefs = [function('add')]
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 6ae4273b9..f7205b3d5 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -114,9 +114,16 @@ def ReturnNumber(): number
return 123
enddef
+let g:notNumber = 'string'
+
+def ReturnGlobal(): number
+ return g:notNumber
+enddef
+
def Test_return_string()
assert_equal('string', ReturnString())
assert_equal(123, ReturnNumber())
+ assert_fails('call ReturnGlobal()', 'E1029: Expected number but got string')
enddef
func Increment()
diff --git a/src/version.c b/src/version.c
index 3cab8b02a..8aca2769a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 292,
+/**/
291,
/**/
290,