Mercurial > vim
diff src/vim9instr.c @ 33286:0c3553cfe22e v9.0.1909
patch 9.0.1909: Vim9: problem calling class method from other class
Commit: https://github.com/vim/vim/commit/00cd18222ee1551c65228e9556c158624507fc7a
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Mon Sep 18 19:56:49 2023 +0200
patch 9.0.1909: Vim9: problem calling class method from other class
Problem: Vim9: problem calling class method from other class
Solution: Fix this problem, fix readonly object access, update error
messages.
Calling a class method from another method without the class name prefix
doesn't work properly.
A readonly object variable is modifiable outside the class using a
nested object assignment.
Remove the unused E1338 error message.
Update error messages.
closes: #13116
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 18 Sep 2023 20:00:12 +0200 |
parents | 877dddec681f |
children | 4e531adb3fac |
line wrap: on
line diff
--- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -1899,9 +1899,15 @@ generate_CALL( // drop the argument types cctx->ctx_type_stack.ga_len -= argcount; - // For an object or class method call, drop the object/class type + // For an object or class method call, drop the object/class type. if (ufunc->uf_class != NULL) - cctx->ctx_type_stack.ga_len--; + { + // When a class method is called without the class name prefix, then + // the type will not be in the stack. + type_T *stype = get_type_on_stack(cctx, 0); + if (stype->tt_type == VAR_CLASS || stype->tt_type == VAR_OBJECT) + cctx->ctx_type_stack.ga_len--; + } // add return type return push_type_stack(cctx, ufunc->uf_ret_type);