From 4799cef85ce43e26f5022290b41a7c85bbab8cad Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 25 Aug 2021 22:37:36 +0200 Subject: patch 8.2.3376: Vim9: no warning that "@r" does not do anything Problem: Vim9: no warning that "@r" does not do anything. Solution: Give a "no effect" error. (closes #8779) --- src/ex_eval.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) (limited to 'src/ex_eval.c') diff --git a/src/ex_eval.c b/src/ex_eval.c index 207defa7f3..259cf670cc 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -887,6 +887,26 @@ report_discard_pending(int pending, void *value) } } + int +cmd_is_name_only(char_u *arg) +{ + char_u *p = arg; + char_u *alias; + int name_only = FALSE; + + if (*p == '&') + { + ++p; + if (STRNCMP("l:", p, 2) == 0 || STRNCMP("g:", p, 2) == 0) + p += 2; + } + else if (*p == '@') + ++p; + get_name_len(&p, &alias, FALSE, FALSE); + name_only = ends_excmd2(arg, skipwhite(p)); + vim_free(alias); + return name_only; +} /* * ":eval". @@ -897,18 +917,10 @@ ex_eval(exarg_T *eap) typval_T tv; evalarg_T evalarg; int name_only = FALSE; - char_u *p; long lnum = SOURCING_LNUM; if (in_vim9script()) - { - char_u *alias; - - p = eap->arg; - get_name_len(&p, &alias, FALSE, FALSE); - name_only = ends_excmd2(eap->arg, skipwhite(p)); - vim_free(alias); - } + name_only = cmd_is_name_only(eap->arg); fill_evalarg_from_eap(&evalarg, eap, eap->skip); -- cgit v1.2.3