diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-17 12:45:15 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-17 12:45:15 +0100 |
| commit | 0d03263fd731986c0eee1a08e0f1b19f1bc3a7ad (patch) | |
| tree | 7777e5301a42e533fc3c51af7ea541816fb29985 | |
| parent | 7ce5b2b590256ce53d6af28c1d203fb3bc1d2d97 (diff) | |
| download | vim-git-0d03263fd731986c0eee1a08e0f1b19f1bc3a7ad.tar.gz | |
patch 8.2.4970: "eval 123" gives an error, "eval 'abc'" does notv8.2.4970
Problem: "eval 123" gives an error, "eval 'abc'" does not.
Solution: Also give an error when evaluating only a string. (closes #10434)
| -rw-r--r-- | src/ex_eval.c | 15 | ||||
| -rw-r--r-- | src/testdir/test_vim9_cmd.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index f3e2ca28c..61d288157 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -888,8 +888,8 @@ report_discard_pending(int pending, void *value) } /* - * Return TRUE if "arg" is only a variable, register, environment variable or - * option name. + * Return TRUE if "arg" is only a variable, register, environment variable, + * option name or string. */ int cmd_is_name_only(char_u *arg) @@ -904,6 +904,17 @@ cmd_is_name_only(char_u *arg) if (*p != NUL) ++p; } + else if (*p == '\'' || *p == '"') + { + int r; + + if (*p == '"') + r = eval_string(&p, NULL, FALSE, FALSE); + else + r = eval_lit_string(&p, NULL, FALSE, FALSE); + if (r == FAIL) + return FALSE; + } else { if (*p == '&') diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index 50719e1b5..77e1d8a06 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -697,6 +697,16 @@ def Test_use_register() END v9.CheckDefAndScriptFailure(lines, 'E1207:', 2) $SomeEnv = '' + + lines =<< trim END + eval 'value' + END + v9.CheckDefAndScriptFailure(lines, 'E1207:', 1) + + lines =<< trim END + eval "value" + END + v9.CheckDefAndScriptFailure(lines, 'E1207:', 1) enddef def Test_environment_use_linebreak() diff --git a/src/version.c b/src/version.c index 485e25780..7bdf34633 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4970, +/**/ 4969, /**/ 4968, |