Mercurial > vim

diff src/vim9script.c @ 32475:a44d7e4ac1c0 v9.0.1569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1569: cannot use "this.member" in lambda in class method Commit: https://github.com/vim/vim/commit/2bd6a09691fc71974ca7ab5973f8e08fdd2a889a Author: h-east <h.east.727@gmail.com> Date: Fri May 19 19:01:17 2023 +0100 patch 9.0.1569: cannot use "this.member" in lambda in class method Problem: Cannot use "this.member" in lambda in class method. Solution: Adjust check for reserved keyword. (Hirohito Higashi, closes #12416, closes #12076, closes #12336)
author Bram Moolenaar <Bram@vim.org>
date Fri, 19 May 2023 20:15:04 +0200
parents 04d9dff67d99
children 304341915488
line wrap: on
line diff
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -838,7 +838,7 @@ vim9_declare_scriptvar(exarg_T *eap, cha
     // parse type, check for reserved name
     p = skipwhite(p + 1);
     type = parse_type(&p, &si->sn_type_list, TRUE);
-    if (type == NULL || check_reserved_name(name, NULL) == FAIL)
+    if (type == NULL || check_reserved_name(name, FALSE) == FAIL)
     {
 	vim_free(name);
 	return p;
@@ -1127,17 +1127,13 @@ static char *reserved[] = {
 };
 
     int
-check_reserved_name(char_u *name, cctx_T *cctx)
+check_reserved_name(char_u *name, int is_objm_access)
 {
     int idx;
 
     for (idx = 0; reserved[idx] != NULL; ++idx)
 	if (STRCMP(reserved[idx], name) == 0
-		// "this" can be used in an object method
-		&& !(STRCMP("this", name) == 0
-		    && cctx != NULL
-		    && cctx->ctx_ufunc != NULL
-		    && (cctx->ctx_ufunc->uf_flags & (FC_OBJECT|FC_NEW))))
+		&& !(STRCMP("this", name) == 0 && is_objm_access))
 	{
 	    semsg(_(e_cannot_use_reserved_name_str), name);
 	    return FAIL;