summaryrefslogtreecommitdiffstats
path: root/src/ex_eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-08-25 22:37:36 +0200
committerBram Moolenaar <Bram@vim.org>2021-08-25 22:37:36 +0200
commit4799cef85ce43e26f5022290b41a7c85bbab8cad (patch)
tree89dc1cbf035efacf2f6091eb3396dc44d51857de /src/ex_eval.c
parentdf9070e300dabf0c54de87a75973a80adb38afa3 (diff)
patch 8.2.3376: Vim9: no warning that "@r" does not do anythingv8.2.3376
Problem: Vim9: no warning that "@r" does not do anything. Solution: Give a "no effect" error. (closes #8779)
Diffstat (limited to 'src/ex_eval.c')
-rw-r--r--src/ex_eval.c30
1 files changed, 21 insertions, 9 deletions
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);