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

patch 9.0.1178: a child class cannot override functions from a base class

Problem:    A child class cannot override functions from a base class.
Solution:   Allow overriding and implement "super".
This commit is contained in:
Bram Moolenaar
2023-01-11 15:59:05 +00:00
parent ad15a39fdb
commit 58b40092e6
8 changed files with 136 additions and 16 deletions

View File

@@ -43,16 +43,31 @@ lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx)
if (len == 0)
return FAIL;
if (len == 4 && STRNCMP(name, "this", 4) == 0
if (((len == 4 && STRNCMP(name, "this", 4) == 0)
|| (len == 5 && STRNCMP(name, "super", 5) == 0))
&& cctx->ctx_ufunc != NULL
&& (cctx->ctx_ufunc->uf_flags & (FC_OBJECT|FC_NEW)))
{
int is_super = *name == 's';
if (lvar != NULL)
{
CLEAR_POINTER(lvar);
lvar->lv_name = (char_u *)"this";
lvar->lv_name = (char_u *)(is_super ? "super" : "this");
if (cctx->ctx_ufunc->uf_class != NULL)
{
lvar->lv_type = &cctx->ctx_ufunc->uf_class->class_object_type;
if (is_super)
{
type_T *type = get_type_ptr(cctx->ctx_type_list);
if (type != NULL)
{
*type = *lvar->lv_type;
lvar->lv_type = type;
type->tt_flags |= TTFLAG_SUPER;
}
}
}
}
return OK;
}