diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-06-25 21:31:09 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-06-25 21:31:09 +0200 |
commit | 22480d147fe83cb31316d2dabc5c5f249477af15 (patch) | |
tree | 41e23f9a7884b11073b1b4f0b76ca318b3560502 | |
parent | f3d30842dcc8ef4134da462bd4197ae2e2c6c0c1 (diff) | |
download | vim-git-22480d147fe83cb31316d2dabc5c5f249477af15.tar.gz |
patch 8.2.3048: strange error for white space after ++ commandv8.2.3048
Problem: Strange error for white space after ++ command.
Solution: Check for white space explicitly. (closes #8440)
-rw-r--r-- | src/errors.h | 2 | ||||
-rw-r--r-- | src/testdir/test_vim9_assign.vim | 6 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9compile.c | 6 | ||||
-rw-r--r-- | src/vim9script.c | 7 |
5 files changed, 23 insertions, 0 deletions
diff --git a/src/errors.h b/src/errors.h index 8a2461b31..b4cf8ae54 100644 --- a/src/errors.h +++ b/src/errors.h @@ -446,3 +446,5 @@ EXTERN char e_libsodium_decryption_failed[] INIT(= N_("E1200: Decryption failed!")); EXTERN char e_libsodium_decryption_failed_premature[] INIT(= N_("E1201: Decryption failed: pre-mature end of file!")); +EXTERN char e_no_white_space_allowed_after_str_str[] + INIT(= N_("E1202: No white space allowed after '%s': %s")); diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim index a26867f59..cba79729c 100644 --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -1906,6 +1906,12 @@ def Test_inc_dec() unlet g:count END CheckDefAndScriptSuccess(lines) + + lines =<< trim END + var nr = 7 + ++ nr + END + CheckDefAndScriptFailure(lines, "E1202: No white space allowed after '++': ++ nr") enddef diff --git a/src/version.c b/src/version.c index 3898725e7..4cef712b6 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 */ /**/ + 3048, +/**/ 3047, /**/ 3046, diff --git a/src/vim9compile.c b/src/vim9compile.c index e78a032cb..cd83aea73 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -6639,6 +6639,12 @@ compile_assignment(char_u *arg, exarg_T *eap, cmdidx_T cmdidx, cctx_T *cctx) } if (eap->cmdidx == CMD_increment || eap->cmdidx == CMD_decrement) { + if (VIM_ISWHITE(eap->cmd[2])) + { + semsg(_(e_no_white_space_allowed_after_str_str), + eap->cmdidx == CMD_increment ? "++" : "--", eap->cmd); + return NULL; + } op = (char_u *)(eap->cmdidx == CMD_increment ? "+=" : "-="); oplen = 2; incdec = TRUE; diff --git a/src/vim9script.c b/src/vim9script.c index 7c6526b65..9dc67a789 100644 --- a/src/vim9script.c +++ b/src/vim9script.c @@ -169,6 +169,13 @@ ex_incdec(exarg_T *eap) char_u *nextcmd = eap->nextcmd; size_t len = STRLEN(eap->cmd) + 8; + if (VIM_ISWHITE(cmd[2])) + { + semsg(_(e_no_white_space_allowed_after_str_str), + eap->cmdidx == CMD_increment ? "++" : "--", eap->cmd); + return; + } + // This works like "nr += 1" or "nr -= 1". // Add a '|' to avoid looking in the next line. eap->cmd = alloc(len); |