thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2165: Vim9: assignment to dict member does not work

Browse Source 
Problem:    Vim9: assignment to dict member does not work.
Solution:   Fix recognizing dict member. (closes #7484)
This commit is contained in:
Bram Moolenaar
2020-12-19 22:10:13 +01:00
parent 17f700ac8b
commit 8f22f5c3aa
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/eval.c
View File

@@ -874,6 +874,13 @@ get_lval(
if (v == NULL) if (v == NULL)
return NULL; return NULL;
if (in_vim9script() && (flags & GLV_NO_DECL) == 0)
{
if (!quiet)
semsg(_(e_variable_already_declared), lp->ll_name);
return NULL;
}
/* /*
* Loop until no more [idx] or .key is following. * Loop until no more [idx] or .key is following.
*/ */

3
src/evalvars.c
View File

@@ -1464,7 +1464,8 @@ ex_let_one(
{ {
lval_T lv; lval_T lv;
p = get_lval(arg, tv, &lv, FALSE, FALSE, 0, FNE_CHECK_START); p = get_lval(arg, tv, &lv, FALSE, FALSE,
(flags & ASSIGN_NO_DECL) ? GLV_NO_DECL : 0, FNE_CHECK_START);
if (p != NULL && lv.ll_name != NULL) if (p != NULL && lv.ll_name != NULL)
{ {
if (endchars != NULL && vim_strchr(endchars, if (endchars != NULL && vim_strchr(endchars,

2
src/ex_docmd.c
View File

@@ -3332,6 +3332,8 @@ find_ex_command(
// When followed by "=" or "+=" then it is an assignment. // When followed by "=" or "+=" then it is an assignment.
++emsg_silent; ++emsg_silent;
if (*after == '.')
after = skipwhite(after + 1);
if (skip_expr(&after, NULL) == OK) if (skip_expr(&after, NULL) == OK)
after = skipwhite(after); after = skipwhite(after);
else else

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2165,
/**/ /**/
2164, 2164,
/**/ /**/

12
src/vim.h
View File

@@ -2536,16 +2536,18 @@ typedef enum {
#define COPYID_MASK (~0x1) #define COPYID_MASK (~0x1)
// Values for trans_function_name() argument: // Values for trans_function_name() argument:
#define TFN_INT 1 // internal function name OK #define TFN_INT 0x01 // internal function name OK
#define TFN_QUIET 2 // no error messages #define TFN_QUIET 0x02 // no error messages
#define TFN_NO_AUTOLOAD 4 // do not use script autoloading #define TFN_NO_AUTOLOAD 0x04 // do not use script autoloading
#define TFN_NO_DEREF 8 // do not dereference a Funcref #define TFN_NO_DEREF 0x08 // do not dereference a Funcref
#define TFN_READ_ONLY 16 // will not change the var #define TFN_READ_ONLY 0x10 // will not change the var
#define TFN_NO_DECL 0x20 // only used for GLV_NO_DECL
// Values for get_lval() flags argument: // Values for get_lval() flags argument:
#define GLV_QUIET TFN_QUIET // no error messages #define GLV_QUIET TFN_QUIET // no error messages
#define GLV_NO_AUTOLOAD TFN_NO_AUTOLOAD // do not use script autoloading #define GLV_NO_AUTOLOAD TFN_NO_AUTOLOAD // do not use script autoloading
#define GLV_READ_ONLY TFN_READ_ONLY // will not change the var #define GLV_READ_ONLY TFN_READ_ONLY // will not change the var
#define GLV_NO_DECL TFN_NO_DECL // assignment without :var or :let
#define DO_NOT_FREE_CNT 99999 // refcount for dict or list that should not #define DO_NOT_FREE_CNT 99999 // refcount for dict or list that should not
// be freed. // be freed.