opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

vim-patch:8.2.0981: Vim9: cannot compile "[var, var] = list" (#28247) 

Problem:    Vim9: cannot compile "[var, var] = list".
Solution:   Implement list assignment.

47a519a933

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2024-04-09 10:10:47 +08:00 committed by GitHub
parent 6d1e41432d
commit 869d303043
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -1892,7 +1892,7 @@ void *eval_for_line(const char *arg, bool *errp, exarg_T *eap, evalarg_T *const
*errp = true; // Default: there is an error.
const char *expr = skip_var_list(arg, &fi->fi_varcount, &fi->fi_semicolon);
const char *expr = skip_var_list(arg, &fi->fi_varcount, &fi->fi_semicolon, false);
if (expr == NULL) {
return fi;
}

15
src/nvim/eval/vars.c
View File

@ -341,7 +341,7 @@ void ex_let(exarg_T *eap)
const char *argend;
int first = true;
argend = skip_var_list(arg, &var_count, &semicolon);
argend = skip_var_list(arg, &var_count, &semicolon, false);
if (argend == NULL) {
return;
}
@ -515,10 +515,11 @@ int ex_let_vars(char *arg_start, typval_T *tv, int copy, int semicolon, int var_
/// Skip over assignable variable "var" or list of variables "[var, var]".
/// Used for ":let varvar = expr" and ":for varvar in expr".
/// For "[var, var]" increment "*var_count" for each variable.
/// for "[var, var; var]" set "semicolon".
/// for "[var, var; var]" set "semicolon" to 1.
/// If "silent" is true do not give an "invalid argument" error message.
///
/// @return NULL for an error.
const char *skip_var_list(const char *arg, int *var_count, int *semicolon)
const char *skip_var_list(const char *arg, int *var_count, int *semicolon, bool silent)
{
if (*arg == '[') {
const char *s;
@ -528,7 +529,9 @@ const char *skip_var_list(const char *arg, int *var_count, int *semicolon)
p = skipwhite(p + 1); // skip whites after '[', ';' or ','
s = skip_var_one(p);
if (s == p) {
semsg(_(e_invarg2), p);
if (!silent) {
semsg(_(e_invarg2), p);
}
return NULL;
}
(*var_count)++;
@ -543,7 +546,9 @@ const char *skip_var_list(const char *arg, int *var_count, int *semicolon)
}
*semicolon = 1;
} else if (*p != ',') {
semsg(_(e_invarg2), p);
if (!silent) {
semsg(_(e_invarg2), p);
}
return NULL;
}
}