Mercurial > vim

diff src/dict.c @ 31002:a09404dad917 v9.0.0836

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0836: wrong error when using extend() with funcref Commit: https://github.com/vim/vim/commit/91c75d18d9cdc32df57e648640de7476fbcb4d76 Author: zeertzjq <zeertzjq@outlook.com> Date: Sat Nov 5 20:21:58 2022 +0000 patch 9.0.0836: wrong error when using extend() with funcref Problem: Wrong error when using extend() with funcref. Solution: Better check the variable type. (closes https://github.com/vim/vim/issues/11468, closes https://github.com/vim/vim/issues/11455)
author Bram Moolenaar <Bram@vim.org>
date Sat, 05 Nov 2022 21:30:04 +0100
parents 360f286b5869
children a86ee6c0309e
line wrap: on
line diff
--- a/src/dict.c
+++ b/src/dict.c
@@ -352,7 +352,7 @@ dict_copy(dict_T *orig, int deep, int to
 }
 
 /*
- * Check for adding a function to g: or s:.
+ * Check for adding a function to g: or s: (in Vim9 script) or l:.
  * If the name is wrong give an error message and return TRUE.
  */
     int
@@ -1105,17 +1105,9 @@ dict_extend(dict_T *d1, dict_T *d2, char
 	{
 	    --todo;
 	    di1 = dict_find(d1, hi2->hi_key, -1);
-	    if (d1->dv_scope != 0)
-	    {
-		// Disallow replacing a builtin function in l: and g:.
-		// Check the key to be valid when adding to any scope.
-		if (d1->dv_scope == VAR_DEF_SCOPE
-			&& HI2DI(hi2)->di_tv.v_type == VAR_FUNC
-			&& var_wrong_func_name(hi2->hi_key, di1 == NULL))
-		    break;
-		if (!valid_varname(hi2->hi_key, -1, TRUE))
-		    break;
-	    }
+	    // Check the key to be valid when adding to any scope.
+	    if (d1->dv_scope != 0 && !valid_varname(hi2->hi_key, -1, TRUE))
+		break;
 
 	    if (type != NULL
 		     && check_typval_arg_type(type, &HI2DI(hi2)->di_tv,
@@ -1138,6 +1130,7 @@ dict_extend(dict_T *d1, dict_T *d2, char
 		if (value_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
 			|| var_check_ro(di1->di_flags, arg_errmsg, TRUE))
 		    break;
+		// Disallow replacing a builtin function.
 		if (dict_wrong_func_name(d1, &HI2DI(hi2)->di_tv, hi2->hi_key))
 		    break;
 		clear_tv(&di1->di_tv);