patch 9.1.1267: Vim9: no support for type list/dict<object<any>>
Problem: Vim9: no support for type list/dict<object<any>>
Solution: add proper support for t_object_any
(Yegappan Lakshmanan)
closes: #17025
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/vim9instr.c b/src/vim9instr.c
index 1b322f6..d4593ea 100644
--- a/src/vim9instr.c
+++ b/src/vim9instr.c
@@ -756,7 +756,7 @@
generate_PUSHOBJ(cctx_T *cctx)
{
RETURN_OK_IF_SKIP(cctx);
- if (generate_instr_type(cctx, ISN_PUSHOBJ, &t_object) == NULL)
+ if (generate_instr_type(cctx, ISN_PUSHOBJ, &t_object_any) == NULL)
return FAIL;
return OK;
}
@@ -2142,7 +2142,8 @@
RETURN_OK_IF_SKIP(cctx);
- if (type->tt_type == VAR_ANY || type->tt_type == VAR_UNKNOWN)
+ if (type->tt_type == VAR_ANY || type->tt_type == VAR_UNKNOWN
+ || type == &t_object_any)
ret_type = &t_any;
else if (type->tt_type == VAR_FUNC || type->tt_type == VAR_PARTIAL)
{
@@ -2213,7 +2214,9 @@
// check for dict type
type = get_type_on_stack(cctx, 0);
if (type->tt_type != VAR_DICT
- && type->tt_type != VAR_ANY && type->tt_type != VAR_UNKNOWN)
+ && type->tt_type != VAR_OBJECT
+ && type->tt_type != VAR_ANY
+ && type->tt_type != VAR_UNKNOWN)
{
char *tofree;