aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.1883: Vim9: Calling an interface method using a child object fails

Browse Source 
Problem:  Vim9: Calling an interface method using a child object fails
Solution: Search methods of parent class

When a class implementing an interface is extended by another class and
a child class instance is passed to a function that accepts the
interface, calling an interface method doesn't work properly.

closes: #13053

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-09-08 19:12:03 +02:00
committed by Christian Brabandt
parent 11d2aeeca4
commit cc0bcf4c9f
3 changed files with 96 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vim9class.c
View File

@@ -237,16 +237,28 @@ object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *cl,
if (cl == itf)
return idx;
itf2class_T *i2c = NULL;
int searching = TRUE;
itf2class_T *i2c = NULL;
int searching = TRUE;
int method_offset = 0;
for (class_T *super = cl; super != NULL && searching;
super = super->class_extends)
{
for (i2c = itf->class_itf2class; i2c != NULL; i2c = i2c->i2c_next)
{
if (i2c->i2c_class == super && i2c->i2c_is_method == is_method)
{
searching = FALSE;
break;
}
}
if (searching && is_method)
// The parent class methods are stored after the current class
// methods.
method_offset += is_static
? super->class_class_function_count_child
: super->class_obj_method_count_child;
}
if (i2c == NULL)
{
siemsg("class %s not found on interface %s",
@@ -273,7 +285,9 @@ object_index_from_itf_index(class_T *itf, int is_method, int idx, class_T *cl,
{
// A table follows the i2c for the class
int *table = (int *)(i2c + 1);
return table[idx];
// "method_offset" is 0, if method is in the current class. If method
// is in a parent class, then it is non-zero.
return table[idx] + method_offset;
}
}