patch 8.2.0512: Vim9: no optional arguments in func type
Problem: Vim9: no optional arguments in func type.
Solution: Check for question mark after type. Find function reference
without function().
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index cf12e85..01579a8 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -21,13 +21,6 @@
let other: list<string> = ['asdf']
enddef
-func Test_def_basic()
- def SomeFunc(): string
- return 'yes'
- enddef
- call assert_equal('yes', SomeFunc())
-endfunc
-
let s:appendToMe = 'xxx'
let s:addToMe = 111
let g:existing = 'yes'
@@ -66,9 +59,9 @@
if has('float')
let float1: float = 3.4
endif
- let funky1: func
- let funky2: func = function('len')
- let party2: func = funcref('Test_syntax')
+ let Funky1: func
+ let Funky2: func = function('len')
+ let Party2: func = funcref('Test_syntax')
" type becomes list<any>
let somelist = rand() > 0 ? [1, 2, 3] : ['a', 'b', 'c']
@@ -134,6 +127,9 @@
assert_equal('noneagain', v:errmsg)
call CheckDefFailure(['v:errmsg += "more"'], 'E1013:')
call CheckDefFailure(['v:errmsg += 123'], 'E1013:')
+enddef
+
+def Test_assignment_default()
" Test default values.
let thebool: bool
@@ -153,8 +149,8 @@
let theblob: blob
assert_equal(0z, theblob)
- let thefunc: func
- assert_equal(test_null_function(), thefunc)
+ let Thefunc: func
+ assert_equal(test_null_function(), Thefunc)
let thelist: list<any>
assert_equal([], thelist)
@@ -264,157 +260,6 @@
enddef
-def ReturnString(): string
- return 'string'
-enddef
-
-def ReturnNumber(): number
- return 123
-enddef
-
-let g:notNumber = 'string'
-
-def ReturnGlobal(): number
- return g:notNumber
-enddef
-
-def Test_return_something()
- assert_equal('string', ReturnString())
- assert_equal(123, ReturnNumber())
- assert_fails('call ReturnGlobal()', 'E1029: Expected number but got string')
-enddef
-
-let s:nothing = 0
-def ReturnNothing()
- s:nothing = 1
- if true
- return
- endif
- s:nothing = 2
-enddef
-
-def Test_return_nothing()
- ReturnNothing()
- assert_equal(1, s:nothing)
-enddef
-
-func Increment()
- let g:counter += 1
-endfunc
-
-def Test_call_ufunc_count()
- g:counter = 1
- Increment()
- Increment()
- Increment()
- " works with and without :call
- assert_equal(4, g:counter)
- call assert_equal(4, g:counter)
- unlet g:counter
-enddef
-
-def MyVarargs(arg: string, ...rest: list<string>): string
- let res = arg
- for s in rest
- res ..= ',' .. s
- endfor
- return res
-enddef
-
-def Test_call_varargs()
- assert_equal('one', MyVarargs('one'))
- assert_equal('one,two', MyVarargs('one', 'two'))
- assert_equal('one,two,three', MyVarargs('one', 'two', 'three'))
-enddef
-
-def MyDefaultArgs(name = 'string'): string
- return name
-enddef
-
-def Test_call_default_args()
- assert_equal('string', MyDefaultArgs())
- assert_equal('one', MyDefaultArgs('one'))
- assert_fails('call MyDefaultArgs("one", "two")', 'E118:')
-
- call CheckScriptFailure(['def Func(arg: number = asdf)', 'enddef'], 'E1001:')
-enddef
-
-func Test_call_default_args_from_func()
- call assert_equal('string', MyDefaultArgs())
- call assert_equal('one', MyDefaultArgs('one'))
- call assert_fails('call MyDefaultArgs("one", "two")', 'E118:')
-endfunc
-
-func TakesOneArg(arg)
- echo a:arg
-endfunc
-
-def Test_call_wrong_args()
- call CheckDefFailure(['TakesOneArg()'], 'E119:')
- call CheckDefFailure(['TakesOneArg(11, 22)'], 'E118:')
- call CheckDefFailure(['bufnr(xxx)'], 'E1001:')
-enddef
-
-" Default arg and varargs
-def MyDefVarargs(one: string, two = 'foo', ...rest: list<string>): string
- let res = one .. ',' .. two
- for s in rest
- res ..= ',' .. s
- endfor
- return res
-enddef
-
-def Test_call_def_varargs()
- call assert_fails('call MyDefVarargs()', 'E119:')
- assert_equal('one,foo', MyDefVarargs('one'))
- assert_equal('one,two', MyDefVarargs('one', 'two'))
- assert_equal('one,two,three', MyDefVarargs('one', 'two', 'three'))
-enddef
-
-def Test_using_var_as_arg()
- call writefile(['def Func(x: number)', 'let x = 234', 'enddef'], 'Xdef')
- call assert_fails('so Xdef', 'E1006:')
- call delete('Xdef')
-enddef
-
-def Test_call_func_defined_later()
- call assert_equal('one', DefinedLater('one'))
- call assert_fails('call NotDefined("one")', 'E117:')
-enddef
-
-func DefinedLater(arg)
- return a:arg
-endfunc
-
-def FuncWithForwardCall()
- return DefinedEvenLater("yes")
-enddef
-
-def DefinedEvenLater(arg: string): string
- return arg
-enddef
-
-def Test_error_in_nested_function()
- " Error in called function requires unwinding the call stack.
- assert_fails('call FuncWithForwardCall()', 'E1029')
-enddef
-
-def Test_return_type_wrong()
- CheckScriptFailure(['def Func(): number', 'return "a"', 'enddef'], 'expected number but got string')
- CheckScriptFailure(['def Func(): string', 'return 1', 'enddef'], 'expected string but got number')
- CheckScriptFailure(['def Func(): void', 'return "a"', 'enddef'], 'expected void but got string')
- CheckScriptFailure(['def Func()', 'return "a"', 'enddef'], 'expected void but got string')
-
- CheckScriptFailure(['def Func(): number', 'return', 'enddef'], 'E1003:')
-
- CheckScriptFailure(['def Func(): list', 'return []', 'enddef'], 'E1008:')
- CheckScriptFailure(['def Func(): dict', 'return {}', 'enddef'], 'E1008:')
-enddef
-
-def Test_arg_type_wrong()
- CheckScriptFailure(['def Func3(items: list)', 'echo "a"', 'enddef'], 'E1008: Missing <type>')
-enddef
-
def Test_try_catch()
let l = []
try
@@ -732,82 +577,6 @@
assert_fails('export something', 'E1042')
enddef
-def Test_vim9script_call()
- let lines =<< trim END
- vim9script
- let var = ''
- def MyFunc(arg: string)
- var = arg
- enddef
- MyFunc('foobar')
- assert_equal('foobar', var)
-
- let str = 'barfoo'
- str->MyFunc()
- assert_equal('barfoo', var)
-
- let g:value = 'value'
- g:value->MyFunc()
- assert_equal('value', var)
-
- let listvar = []
- def ListFunc(arg: list<number>)
- listvar = arg
- enddef
- [1, 2, 3]->ListFunc()
- assert_equal([1, 2, 3], listvar)
-
- let dictvar = {}
- def DictFunc(arg: dict<number>)
- dictvar = arg
- enddef
- {'a': 1, 'b': 2}->DictFunc()
- assert_equal(#{a: 1, b: 2}, dictvar)
- def CompiledDict()
- {'a': 3, 'b': 4}->DictFunc()
- enddef
- CompiledDict()
- assert_equal(#{a: 3, b: 4}, dictvar)
-
- #{a: 3, b: 4}->DictFunc()
- assert_equal(#{a: 3, b: 4}, dictvar)
-
- ('text')->MyFunc()
- assert_equal('text', var)
- ("some")->MyFunc()
- assert_equal('some', var)
- END
- writefile(lines, 'Xcall.vim')
- source Xcall.vim
- delete('Xcall.vim')
-enddef
-
-def Test_vim9script_call_fail_decl()
- let lines =<< trim END
- vim9script
- let var = ''
- def MyFunc(arg: string)
- let var = 123
- enddef
- END
- writefile(lines, 'Xcall_decl.vim')
- assert_fails('source Xcall_decl.vim', 'E1054:')
- delete('Xcall_decl.vim')
-enddef
-
-def Test_vim9script_call_fail_const()
- let lines =<< trim END
- vim9script
- const var = ''
- def MyFunc(arg: string)
- var = 'asdf'
- enddef
- END
- writefile(lines, 'Xcall_const.vim')
- assert_fails('source Xcall_const.vim', 'E46:')
- delete('Xcall_const.vim')
-enddef
-
def Test_vim9script_reload()
let lines =<< trim END
vim9script
@@ -926,17 +695,6 @@
assert_equal([2, 99, 3, 4, 5], l)
enddef
-" Test that inside :function a Python function can be defined, :def is not
-" recognized.
-func Test_function_python()
- CheckFeature python3
- let py = 'python3'
- execute py "<< EOF"
-def do_something():
- return 1
-EOF
-endfunc
-
def IfElse(what: number): string
let res = ''
if what == 1
@@ -1087,27 +845,6 @@
call CheckDefFailure(["if has('aaa') ? true false"], 'E109:')
enddef
-def Test_delfunc()
- let lines =<< trim END
- vim9script
- def GoneSoon()
- echo 'hello'
- enddef
-
- def CallGoneSoon()
- GoneSoon()
- enddef
-
- delfunc GoneSoon
- CallGoneSoon()
- END
- writefile(lines, 'XToDelFunc')
- assert_fails('so XToDelFunc', 'E933')
- assert_fails('so XToDelFunc', 'E933')
-
- delete('XToDelFunc')
-enddef
-
def Test_execute_cmd()
new
setline(1, 'default')
@@ -1222,83 +959,6 @@
assert_true(caught, 'should have caught an exception')
enddef
-def Test_redef_failure()
- call writefile(['def Func0(): string', 'return "Func0"', 'enddef'], 'Xdef')
- so Xdef
- call writefile(['def Func1(): string', 'return "Func1"', 'enddef'], 'Xdef')
- so Xdef
- call writefile(['def! Func0(): string', 'enddef'], 'Xdef')
- call assert_fails('so Xdef', 'E1027:')
- call writefile(['def Func2(): string', 'return "Func2"', 'enddef'], 'Xdef')
- so Xdef
- call delete('Xdef')
-
- call assert_equal(0, Func0())
- call assert_equal('Func1', Func1())
- call assert_equal('Func2', Func2())
-
- delfunc! Func0
- delfunc! Func1
- delfunc! Func2
-enddef
-
-" Test for internal functions returning different types
-func Test_InternalFuncRetType()
- let lines =<< trim END
- def RetFloat(): float
- return ceil(1.456)
- enddef
-
- def RetListAny(): list<any>
- return items({'k' : 'v'})
- enddef
-
- def RetListString(): list<string>
- return split('a:b:c', ':')
- enddef
-
- def RetListDictAny(): list<dict<any>>
- return getbufinfo()
- enddef
-
- def RetDictNumber(): dict<number>
- return wordcount()
- enddef
-
- def RetDictString(): dict<string>
- return environ()
- enddef
- END
- call writefile(lines, 'Xscript')
- source Xscript
-
- call assert_equal(2.0, RetFloat())
- call assert_equal([['k', 'v']], RetListAny())
- call assert_equal(['a', 'b', 'c'], RetListString())
- call assert_notequal([], RetListDictAny())
- call assert_notequal({}, RetDictNumber())
- call assert_notequal({}, RetDictString())
- call delete('Xscript')
-endfunc
-
-" Test for passing too many or too few arguments to internal functions
-func Test_internalfunc_arg_error()
- let l =<< trim END
- def! FArgErr(): float
- return ceil(1.1, 2)
- enddef
- END
- call writefile(l, 'Xinvalidarg')
- call assert_fails('so Xinvalidarg', 'E118:')
- let l =<< trim END
- def! FArgErr(): float
- return ceil()
- enddef
- END
- call writefile(l, 'Xinvalidarg')
- call assert_fails('so Xinvalidarg', 'E119:')
- call delete('Xinvalidarg')
-endfunc
" Keep this last, it messes up highlighting.
def Test_substitute_cmd()