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

patch 8.2.2527: Vim9: lambda return type is not determined at script level

Browse Source 
Problem:    Vim9: lambda return type is not determined at script level.
Solution:   Compile the lambda to get the return type. (closes #7843)
This commit is contained in:
Bram Moolenaar
2021-02-17 17:00:27 +01:00
parent 527ed38cfa
commit 064095012c
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.c
View File

@@ -3421,7 +3421,17 @@ eval7(
*/
case '(': ret = NOTDONE;
if (in_vim9script())
{
ret = get_lambda_tv(arg, rettv, TRUE, evalarg);
if (ret == OK && evaluate)
{
ufunc_T *ufunc = rettv->vval.v_partial->pt_func;
// compile it here to get the return type
compile_def_function(ufunc,
TRUE, PROFILING(ufunc), NULL);
}
}
if (ret == NOTDONE)
{
*arg = skipwhite_and_linebreak(*arg + 1, evalarg);

5
src/testdir/test_vim9_assign.vim
View File

@@ -1108,6 +1108,8 @@ def Test_assign_lambda()
assert_equal(123, FuncRef_Func())
var FuncRef_Any: any = () => 123
assert_equal(123, FuncRef_Any())
var FuncRef_Number: func(): number = () => 321
assert_equal(321, FuncRef_Number())
END
CheckScriptSuccess(lines)
@@ -1115,8 +1117,7 @@ def Test_assign_lambda()
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')
CheckDefAndScriptFailure(lines, 'E1012: Type mismatch; expected func(number) but got func(any): bool')
enddef
def Test_heredoc()

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2527,
/**/
2526,
/**/

6
src/vim.h
View File

@@ -1787,6 +1787,12 @@ typedef struct timeval proftime_T;
typedef int proftime_T; // dummy for function prototypes
#endif
#ifdef FEAT_PROFILE
# define PROFILING(ufunc) (do_profiling == PROF_YES && (ufunc)->uf_profiling)
#else
# define PROFILING(ufunc) FALSE
#endif
/*
* When compiling with 32 bit Perl time_t is 32 bits in the Perl code but 64
* bits elsewhere. That causes memory corruption. Define time_T and use it

2
src/vim9.h
View File

@@ -418,11 +418,9 @@ extern garray_T def_functions;
#define LNUM_VARIABLE_RANGE_ABOVE -888
#ifdef FEAT_PROFILE
# define PROFILING(ufunc) (do_profiling == PROF_YES && (ufunc)->uf_profiling)
# define INSTRUCTIONS(dfunc) \
((do_profiling == PROF_YES && (dfunc->df_ufunc)->uf_profiling) \
? (dfunc)->df_instr_prof : (dfunc)->df_instr)
#else
# define PROFILING(ufunc) FALSE
# define INSTRUCTIONS(dfunc) ((dfunc)->df_instr)
#endif