Mercurial > vim
changeset 27515:1aff400b819e v8.2.4285
patch 8.2.4285: Vim9: type of item in for loop not checked properly
Commit: https://github.com/vim/vim/commit/a1c519518050383e7d319514a3ff6c42a9154c48
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 2 16:20:26 2022 +0000
patch 8.2.4285: Vim9: type of item in for loop not checked properly
Problem: Vim9: type of item in for loop not checked properly.
Solution: Adjust the type checking. (closes https://github.com/vim/vim/issues/9683)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 02 Feb 2022 17:30:05 +0100 |
| parents | 259fb2aa75c0 |
| children | fdcbdd530e4c |
| files | src/proto/vim9compile.pro src/testdir/test_vim9_script.vim src/version.c src/vim9cmds.c src/vim9compile.c |
| diffstat | 5 files changed, 23 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/proto/vim9compile.pro +++ b/src/proto/vim9compile.pro @@ -4,6 +4,7 @@ int arg_exists(char_u *name, size_t len, int script_is_vim9(void); int script_var_exists(char_u *name, size_t len, cctx_T *cctx); int check_defined(char_u *p, size_t len, cctx_T *cctx, int is_arg); +int need_type_where(type_T *actual, type_T *expected, int offset, where_T where, cctx_T *cctx, int silent, int actual_is_const); int need_type(type_T *actual, type_T *expected, int offset, int arg_idx, cctx_T *cctx, int silent, int actual_is_const); lvar_T *reserve_local(cctx_T *cctx, char_u *name, size_t len, int isConst, type_T *type); int get_script_item_idx(int sid, char_u *name, int check_writable, cctx_T *cctx);
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2011,7 +2011,7 @@ def Test_for_loop_fails() echo k v endfor END - v9.CheckDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected job but got string', 2) + v9.CheckDefExecAndScriptFailure(lines, ['E1013: Argument 1: type mismatch, expected job but got string', 'E1012: Type mismatch; expected job but got string'], 2) lines =<< trim END var i = 0 @@ -2036,6 +2036,22 @@ def Test_for_loop_fails() endfor END v9.CheckDefExecAndScriptFailure(lines, ['E461:', 'E1017:']) + + lines =<< trim END + var l: list<dict<any>> = [{a: 1, b: 'x'}] + for item: dict<number> in l + echo item + endfor + END + v9.CheckDefExecAndScriptFailure(lines, 'E1012: Type mismatch; expected dict<number> but got dict<any>') + + lines =<< trim END + var l: list<dict<any>> = [{n: 1}] + for item: dict<number> in l + item->extend({s: ''}) + endfor + END + v9.CheckDefExecAndScriptFailure(lines, 'E1013: Argument 2: type mismatch, expected dict<number> but got dict<string>') enddef def Test_for_loop_script_var()
--- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4285, +/**/ 4284, /**/ 4283,
--- a/src/vim9cmds.c +++ b/src/vim9cmds.c @@ -990,11 +990,8 @@ compile_for(char_u *arg_start, cctx_T *c if (lhs_type == &t_any) lhs_type = item_type; else if (item_type != &t_unknown - && (item_type == &t_any - ? need_type(item_type, lhs_type, - -1, 0, cctx, FALSE, FALSE) - : check_type(lhs_type, item_type, TRUE, where)) - == FAIL) + && need_type_where(item_type, lhs_type, -1, + where, cctx, FALSE, FALSE) == FAIL) goto failed; var_lvar = reserve_local(cctx, arg, varlen, TRUE, lhs_type); if (var_lvar == NULL) @@ -1003,8 +1000,6 @@ compile_for(char_u *arg_start, cctx_T *c if (semicolon && idx == var_count - 1) var_lvar->lv_type = vartype; - else - var_lvar->lv_type = item_type; generate_STORE(cctx, ISN_STORE, var_lvar->lv_idx, NULL); }