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

patch 8.2.0519: Vim9: return type not properly checked

Browse Source 
Problem:    Vim9: return type not properly checked.
Solution:   Check type properly, also at runtime.
This commit is contained in:
Bram Moolenaar
2020-04-05 22:14:54 +02:00
parent 5ba8d3578c
commit 8922860afb
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vim9compile.c
View File

@@ -2432,7 +2432,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
if (ret == FAIL && give_msg)
type_mismatch(expected, actual);
}
return OK;
return ret;
}
/*
@@ -2444,7 +2444,7 @@ check_type(type_T *expected, type_T *actual, int give_msg)
static int
need_type(type_T *actual, type_T *expected, int offset, cctx_T *cctx)
{
if (check_type(expected, actual, FALSE))
if (check_type(expected, actual, FALSE) == OK)
return OK;
if (actual->tt_type != VAR_ANY && actual->tt_type != VAR_UNKNOWN)
{
@@ -4069,7 +4069,7 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx)
lvar->lv_type = stacktype;
}
}
else if (check_type(lvar->lv_type, stacktype, TRUE) == FAIL)
else if (need_type(stacktype, lvar->lv_type, -1, cctx) == FAIL)
goto theend;
}
else if (*p != '=' && check_type(type, stacktype, TRUE) == FAIL)