aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 9.0.1928: Vim9: constructor type checking bug

Browse Source 
Problem:  Vim9: constructor type checking bug
Solution: Fix class constructor regression

closes: #13102
closes: #13113

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: h-east <h.east.727@gmail.com>
This commit is contained in:
h-east
2023-09-24 15:46:31 +02:00
committed by Christian Brabandt
parent ceee7a808c
commit b895b0fabc
10 changed files with 98 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vim9expr.c
View File

@@ -395,8 +395,8 @@ compile_class_object_index(cctx_T *cctx, char_u **arg, type_T *type)
if (type->tt_type == VAR_OBJECT
&& (cl->class_flags & (CLASS_INTERFACE | CLASS_EXTENDED)))
return generate_CALL(cctx, ufunc, cl, fi, type, argcount);
return generate_CALL(cctx, ufunc, NULL, 0, type, argcount);
return generate_CALL(cctx, ufunc, cl, fi, argcount);
return generate_CALL(cctx, ufunc, NULL, 0, argcount);
}
if (type->tt_type == VAR_OBJECT)
@@ -977,7 +977,6 @@ compile_call(
int has_g_namespace;
ca_special_T special_fn;
imported_T *import;
type_T *type;
if (varlen >= sizeof(namebuf))
{
@@ -1061,7 +1060,6 @@ compile_call(
if (compile_arguments(arg, cctx, &argcount, special_fn) == FAIL)
goto theend;
type = get_decl_type_on_stack(cctx, 1);
is_autoload = vim_strchr(name, AUTOLOAD_CHAR) != NULL;
if (ASCII_ISLOWER(*name) && name[1] != ':' && !is_autoload)
{
@@ -1079,6 +1077,8 @@ compile_call(
if (STRCMP(name, "add") == 0 && argcount == 2)
{
type_T *type = get_decl_type_on_stack(cctx, 1);
// add() can be compiled to instructions if we know the type
if (type->tt_type == VAR_LIST)
{
@@ -1128,7 +1128,7 @@ compile_call(
{
if (!func_is_global(ufunc))
{
res = generate_CALL(cctx, ufunc, NULL, 0, type, argcount);
res = generate_CALL(cctx, ufunc, NULL, 0, argcount);
goto theend;
}
if (!has_g_namespace
@@ -1147,7 +1147,7 @@ compile_call(
if (cctx->ctx_ufunc->uf_defclass == cl)
{
res = generate_CALL(cctx, cl->class_class_functions[mi], NULL,
0, type, argcount);
0, argcount);
}
else
{
@@ -1175,7 +1175,7 @@ compile_call(
// If we can find a global function by name generate the right call.
if (ufunc != NULL)
{
res = generate_CALL(cctx, ufunc, NULL, 0, type, argcount);
res = generate_CALL(cctx, ufunc, NULL, 0, argcount);
goto theend;
}