diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-08-25 22:37:36 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-08-25 22:37:36 +0200 |
commit | 4799cef85ce43e26f5022290b41a7c85bbab8cad (patch) | |
tree | 89dc1cbf035efacf2f6091eb3396dc44d51857de | |
parent | df9070e300dabf0c54de87a75973a80adb38afa3 (diff) | |
download | vim-git-4799cef85ce43e26f5022290b41a7c85bbab8cad.tar.gz |
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)
-rw-r--r-- | src/ex_eval.c | 30 | ||||
-rw-r--r-- | src/proto/ex_eval.pro | 1 | ||||
-rw-r--r-- | src/testdir/test_vim9_cmd.vim | 8 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 6 |
5 files changed, 32 insertions, 15 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 207defa7f..259cf670c 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); diff --git a/src/proto/ex_eval.pro b/src/proto/ex_eval.pro index f5037c932..a3be429b1 100644 --- a/src/proto/ex_eval.pro +++ b/src/proto/ex_eval.pro @@ -12,6 +12,7 @@ int throw_exception(void *value, except_type_T type, char_u *cmdname); void discard_current_exception(void); void catch_exception(except_T *excp); void report_make_pending(int pending, void *value); +int cmd_is_name_only(char_u *arg); void ex_eval(exarg_T *eap); void ex_if(exarg_T *eap); void ex_endif(exarg_T *eap); diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 128575b95..93b1295d4 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -537,7 +537,7 @@ def Test_option_use_linebreak() CheckDefAndScriptSuccess(lines) enddef -def Test_register_use_linebreak() +def Test_use_register() var lines =<< trim END new @a = 'one' @@ -551,6 +551,12 @@ def Test_register_use_linebreak() bwipe! END CheckDefAndScriptSuccess(lines) + + lines =<< trim END + @a = 'echo "text"' + @a + END + CheckDefAndScriptFailure(lines, 'E1207:') enddef def Test_environment_use_linebreak() diff --git a/src/version.c b/src/version.c index 5211f8fae..22dc44004 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3376, +/**/ 3375, /**/ 3374, diff --git a/src/vim9compile.c b/src/vim9compile.c index 97bd292bb..a4d8423fc 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -8828,17 +8828,13 @@ compile_eval(char_u *arg, cctx_T *cctx) { char_u *p = arg; int name_only; - char_u *alias; long lnum = SOURCING_LNUM; // find_ex_command() will consider a variable name an expression, assuming // that something follows on the next line. Check that something actually // follows, otherwise it's probably a misplaced command. - get_name_len(&p, &alias, FALSE, FALSE); - name_only = ends_excmd2(arg, skipwhite(p)); - vim_free(alias); + name_only = cmd_is_name_only(arg); - p = arg; if (compile_expr0(&p, cctx) == FAIL) return NULL; |