aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-04-09 10:10:47 +0800
committerGitHub <noreply@github.com>2024-04-09 10:10:47 +0800
commit869d30304319a2839306ea56c37256a120a7efef (patch)
tree98d602128221a8c9635cad00a9b6e540b07cf187
parent6d1e41432d6e8e0be586b5d9ba29e78ce2cba26d (diff)
downloadrneovim-869d30304319a2839306ea56c37256a120a7efef.tar.gz
rneovim-869d30304319a2839306ea56c37256a120a7efef.tar.bz2
rneovim-869d30304319a2839306ea56c37256a120a7efef.zip
vim-patch:8.2.0981: Vim9: cannot compile "[var, var] = list" (#28247)
Problem: Vim9: cannot compile "[var, var] = list". Solution: Implement list assignment. https://github.com/vim/vim/commit/47a519a933e8bcaf703a5feaac5c01491a658ee3 Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--src/nvim/eval.c2
-rw-r--r--src/nvim/eval/vars.c15
2 files changed, 11 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 9e15ea9369..198d7b3bc8 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -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;
}
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
index e016c65d90..7217f84420 100644
--- a/src/nvim/eval/vars.c
+++ b/src/nvim/eval/vars.c
@@ -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;
}
}