Mercurial > vim

changeset 23531:f39a18a42aed v8.2.2308

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.2308: Vim9: no error when assigning lambda to funcref Commit: https://github.com/vim/vim/commit/328eac2b5d1569c57e1130ecb9f7cca733b84d78 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 7 19:23:08 2021 +0100 patch 8.2.2308: Vim9: no error when assigning lambda to funcref Problem: Vim9: no error when assigning lambda to funcref without return value. Solution: Default return value to "any". (closes #7629)
author Bram Moolenaar <Bram@vim.org>
date Thu, 07 Jan 2021 19:30:06 +0100
parents 47d509a28915
children 6211ea9df22c
files src/testdir/test_vim9_assign.vim src/testdir/test_vim9_func.vim src/userfunc.c src/version.c src/vim9compile.c
diffstat 5 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1091,6 +1091,13 @@ def Test_assign_lambda()
       assert_equal(123, FuncRef_Any())
   END
   CheckScriptSuccess(lines)
+
+  lines =<< trim END
+      var Ref: func(number)
+      Ref = (j) => !j
+  END
+  CheckDefFailure(lines, 'E1012: Type mismatch; expected func(number) but got func(any): bool')
+  CheckScriptFailure(['vim9script'] + lines, 'E1012: Type mismatch; expected func(number) but got func(any): any')
 enddef
 
 def Test_heredoc()
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1508,7 +1508,7 @@ def Test_unknown_function()
       'delfunc g:NotExist'], 'E700:')
 enddef
 
-def RefFunc(Ref: func(string): string): string
+def RefFunc(Ref: func(any): any): string
   return Ref('more')
 enddef
 
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -668,7 +668,7 @@ get_lambda_tv(
 		    goto errret;
 	    }
 	    else
-		fp->uf_ret_type = &t_unknown;
+		fp->uf_ret_type = &t_any;
 	}
 
 	fp->uf_lines = newlines;
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2308,
+/**/
     2307,
 /**/
     2306,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -857,7 +857,9 @@ use_typecheck(type_T *actual, type_T *ex
 	    || (actual->tt_type == VAR_FUNC
 		&& (expected->tt_type == VAR_FUNC
 					   || expected->tt_type == VAR_PARTIAL)
-		&& (actual->tt_member == &t_any || actual->tt_argcount < 0)))
+		&& (actual->tt_member == &t_any || actual->tt_argcount < 0)
+		&& ((actual->tt_member == &t_void)
+					 == (expected->tt_member == &t_void))))
 	return TRUE;
     if ((actual->tt_type == VAR_LIST || actual->tt_type == VAR_DICT)
 				       && actual->tt_type == expected->tt_type)
@@ -4812,7 +4814,8 @@ compile_return(char_u *arg, int check_re
 	{
 	    stack_type = ((type_T **)stack->ga_data)[stack->ga_len - 1];
 	    if (check_return_type && (cctx->ctx_ufunc->uf_ret_type == NULL
-				|| cctx->ctx_ufunc->uf_ret_type == &t_unknown))
+				|| cctx->ctx_ufunc->uf_ret_type == &t_unknown
+				|| cctx->ctx_ufunc->uf_ret_type == &t_any))
 	    {
 		cctx->ctx_ufunc->uf_ret_type = stack_type;
 	    }