mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 01:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2784: Vim9: cannot use \=expr in :substitute

Browse Source 
Problem:    Vim9: cannot use \=expr in :substitute.
Solution:   Compile the expression into instructions and execute them when
            invoked.

4c13721482

Vim9 script is N/A, including substitute_instr.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-11-23 16:04:45 +08:00
parent 879617c9bb
commit ed8f9ff47b
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/ex_cmds.c
View File

@@ -3222,6 +3222,25 @@ static char *sub_parse_flags(char *cmd, subflags_T *subflags, int *which_pat)
return cmd; return cmd;
} }
/// Skip over the "sub" part in :s/pat/sub/ where "delimiter" is the separating
/// character.
static char *skip_substitute(char *start, int delimiter)
{
char *p = start;
while (p[0]) {
if (p[0] == delimiter) { // end delimiter found
*p++ = NUL; // replace it with a NUL
break;
}
if (p[0] == '\\' && p[1] != 0) { // skip escaped characters
p++;
}
MB_PTR_ADV(p);
}
return p;
}
static int check_regexp_delim(int c) static int check_regexp_delim(int c)
FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
{ {
@@ -3349,17 +3368,7 @@ static int do_sub(exarg_T *eap, const proftime_T timeout, const int cmdpreview_n
// Small incompatibility: vi sees '\n' as end of the command, but in // Small incompatibility: vi sees '\n' as end of the command, but in
// Vim we want to use '\n' to find/substitute a NUL. // Vim we want to use '\n' to find/substitute a NUL.
sub = cmd; // remember the start of the substitution sub = cmd; // remember the start of the substitution
cmd = skip_substitute(cmd, delimiter);
while (cmd[0]) {
if (cmd[0] == delimiter) { // end delimiter found
*cmd++ = NUL; // replace it with a NUL
break;
}
if (cmd[0] == '\\' && cmd[1] != 0) { // skip escaped characters
cmd++;
}
MB_PTR_ADV(cmd);
}
if (!eap->skip && cmdpreview_ns <= 0) { if (!eap->skip && cmdpreview_ns <= 0) {
sub_set_replacement((SubReplacementString) { sub_set_replacement((SubReplacementString) {