patch 9.0.2182: Vim9: need a way to reserve future extension
Commit:
https://github.com/vim/vim/commit/ff6f0d5c38e81f742e1161c1504fc6b8e45d9a1e
Author: Yegappan Lakshmanan <[email protected]>
Date: Thu Dec 21 16:46:18 2023 +0100
patch 9.0.2182: Vim9: need a way to reserve future extension
Problem: Vim9: need a way to reserve future extension
Solution: reserve double underscore prefix for future use
(Yegappan Lakshmanan)
related: #13238
closes: #13742
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/doc/vim9class.txt b/runtime/doc/vim9class.txt
index 4dc67bd87..929597c70 100644
--- a/runtime/doc/vim9class.txt
+++ b/runtime/doc/vim9class.txt
@@ -364,6 +364,9 @@ super class. Depending on the class where the member is
used the
corresponding class member will be used. The type of the class member in a
child class can be different from that in the super class.
+The double underscore (__) prefix for a class or object method name is
+reserved for future use.
+
*object-final-variable* *E1409*
The |:final| keyword can be used to make a class or object variable a
constant. Examples: >
diff --git a/src/testdir/test_vim9_class.vim b/src/testdir/test_vim9_class.vim
index c28716aa1..e2c61b03b 100644
--- a/src/testdir/test_vim9_class.vim
+++ b/src/testdir/test_vim9_class.vim
@@ -9659,4 +9659,31 @@ def Test_const_class_object_variable()
v9.CheckSourceFailure(lines, 'E1022: Type or initialization required', 3)
enddef
+" Test for using double underscore prefix in a class/object method name.
+def Test_method_double_underscore_prefix()
+ # class method
+ var lines =<< trim END
+ vim9script
+ class A
+ static def __foo()
+ echo "foo"
+ enddef
+ endclass
+ defcompile
+ END
+ v9.CheckSourceFailure(lines, 'E1034: Cannot use reserved name __foo()', 3)
+
+ # object method
+ lines =<< trim END
+ vim9script
+ class A
+ def __foo()
+ echo "foo"
+ enddef
+ endclass
+ defcompile
+ END
+ v9.CheckSourceFailure(lines, 'E1034: Cannot use reserved name __foo()', 3)
+enddef
+
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 316e63892..6120c538a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 2182,
/**/
2181,
/**/
diff --git a/src/vim9class.c b/src/vim9class.c
index ec1bb86d0..e5d9aeb4b 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -1774,6 +1774,15 @@ early_ret:
break;
}
+ if (*p == '_' && *(p + 1) == '_')
+ {
+ // double underscore prefix for a method name is currently
+ // reserved. This could be used in the future to support
+ // object methods called by Vim builtin functions.
+ semsg(_(e_cannot_use_reserved_name_str), p);
+ break;
+ }
+
CLEAR_FIELD(ea);
ea.cmd = line;
ea.arg = p;
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 17a3b6a5c..868acb469 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2263,12 +2263,12 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u
*var_start, cctx_T *cctx)
// "this.value": load "this" object and get the value at index for an
// object or class member get the type of the member.
// Also for "obj.value".
- char_u *dot = vim_strchr(var_start, '.');
- if (dot == NULL)
- {
- semsg(_(e_missing_dot_after_object_str), lhs->lhs_name);
- return FAIL;
- }
+ char_u *dot = vim_strchr(var_start, '.');
+ if (dot == NULL)
+ {
+ semsg(_(e_missing_dot_after_object_str), lhs->lhs_name);
+ return FAIL;
+ }
class_T *cl = lhs->lhs_type->tt_class;
type_T *type = oc_member_type(cl, TRUE, dot + 1,
@@ -2295,12 +2295,12 @@ compile_load_lhs_with_index(lhs_T *lhs, char_u
*var_start, cctx_T *cctx)
else if (lhs->lhs_type->tt_type == VAR_CLASS)
{
// "<classname>.value": load class variable "classname.value"
- char_u *dot = vim_strchr(var_start, '.');
- if (dot == NULL)
- {
- check_type_is_value(lhs->lhs_type);
- return FAIL;
- }
+ char_u *dot = vim_strchr(var_start, '.');
+ if (dot == NULL)
+ {
+ check_type_is_value(lhs->lhs_type);
+ return FAIL;
+ }
class_T *cl = lhs->lhs_type->tt_class;
ocmember_T *m = class_member_lookup(cl, dot + 1,
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rGLSu-006h1y-IU%40256bit.org.
