From 0d03263fd731986c0eee1a08e0f1b19f1bc3a7ad Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 17 May 2022 12:45:15 +0100 Subject: [PATCH] patch 8.2.4970: "eval 123" gives an error, "eval 'abc'" does not Problem: "eval 123" gives an error, "eval 'abc'" does not. Solution: Also give an error when evaluating only a string. (closes #10434) --- src/ex_eval.c | 15 +++++++++++++-- src/testdir/test_vim9_cmd.vim | 10 ++++++++++ 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 @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4970, /**/ 4969, /**/ -- 2.50.0