aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-14 23:04:02 -05:00
Code Activity

patch 9.1.1232: Vim script is missing the tuple data type

Browse Source 
Problem:  Vim script is missing the tuple data type
Solution: Add support for the tuple data type
          (Yegappan Lakshmanan)

closes: #16776

Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Yegappan Lakshmanan
2025-03-23 16:42:16 +01:00
committed by Christian Brabandt
parent adb703e1b9
commit 9cb865e95b
75 changed files with 7155 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/vim9cmds.c
View File

@@ -870,6 +870,40 @@ compile_fill_loop_info(loop_info_T *loop_info, int funcref_idx, cctx_T *cctx)
loop_info->li_closure_count = cctx->ctx_closure_count;
}
/*
* When compiling a for loop to iterate over a tuple, get the type of the loop
* variable to use.
*/
static type_T *
compile_for_tuple_get_vartype(type_T *vartype, int var_list)
{
// If this is not a variadic tuple, or all the tuple items don't have
// the same type, then use t_any
if (!(vartype->tt_flags & TTFLAG_VARARGS) || vartype->tt_argcount != 1)
return &t_any;
// variadic tuple
type_T *member_type = vartype->tt_args[0]->tt_member;
if (member_type->tt_type == VAR_ANY)
return &t_any;
if (!var_list)
// for x in tuple<...list<xxx>>
return member_type;
if (member_type->tt_type == VAR_LIST
&& member_type->tt_member->tt_type != VAR_ANY)
// for [x, y] in tuple<...list<list<xxx>>>
return member_type->tt_member;
else if (member_type->tt_type == VAR_TUPLE
&& member_type->tt_flags & TTFLAG_VARARGS
&& member_type->tt_argcount == 1)
// for [x, y] in tuple<...list<tuple<...list<xxx>>>>
return member_type->tt_args[0]->tt_member;
return &t_any;
}
/*
* Compile "for var in expr":
*
@@ -1000,6 +1034,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
// give an error now.
vartype = get_type_on_stack(cctx, 0);
if (vartype->tt_type != VAR_LIST
&& vartype->tt_type != VAR_TUPLE
&& vartype->tt_type != VAR_STRING
&& vartype->tt_type != VAR_BLOB
&& vartype->tt_type != VAR_ANY
@@ -1024,6 +1059,8 @@ compile_for(char_u *arg_start, cctx_T *cctx)
&& vartype->tt_member->tt_member->tt_type != VAR_ANY)
item_type = vartype->tt_member->tt_member;
}
else if (vartype->tt_type == VAR_TUPLE)
item_type = compile_for_tuple_get_vartype(vartype, var_list);
// CMDMOD_REV must come before the FOR instruction.
generate_undo_cmdmods(cctx);