adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0217: regexp: verymagic cannot match before/after a mark

Browse Source 
Problem:  regexp: verymagic cannot match before/after a mark
Solution: Correctly check for the very magic check (Julio B)

Fix regexp parser for \v%>'m and \v%<'m
Currently \v%'m works fine, but it is unable to match before or after
the position of mark m.

closes: #14309

Signed-off-by: Julio B <julio.bacel@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Julio B
2024-03-28 10:23:37 +01:00
committed by Christian Brabandt
parent 74a2331846
commit 46fa3c7e27
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/regexp_bt.c
View File

@ -1641,7 +1641,7 @@ regatom(int *flagp)
n = n * 10 + (c - '0');
c = getchr();
}
if (c == '\'' && n == 0)
if (no_Magic(c) == '\'' && n == 0)
{
// "\%'m", "\%<'m" and "\%>'m": Mark
c = getchr();

2
src/regexp_nfa.c
View File

@ -1733,7 +1733,7 @@ nfa_regatom(void)
EMIT((int)n);
break;
}
else if (c == '\'' && n == 0)
else if (no_Magic(c) == '\'' && n == 0)
{
// \%'m \%<'m \%>'m
EMIT(cmp == '<' ? NFA_MARK_LT :

14
src/testdir/test_regexp_latin.vim
View File

@ -874,12 +874,26 @@ func Regex_Mark()
%d
endfunc
" Same test as abobe, but use verymagic
func Regex_Mark_Verymagic()
call append(0, ['', '', '', 'Marks:', 'asdfSasdfsadfEasdf', 'asdfSas',
\ 'dfsadfEasdf', '', '', '', '', ''])
call cursor(4, 1)
exe "normal jfSmsfEme:.-4,.+6s/\\v.%>'s.*%<'e../here/\<CR>"
exe "normal jfSmsj0fEme:.-4,.+6s/\\v.%>'s\\_.*%<'e../again/\<CR>"
call assert_equal(['', '', '', 'Marks:', 'asdfhereasdf', 'asdfagainasdf',
\ '', '', '', '', '', ''], getline(1, '$'))
%d
endfunc
func Test_matching_marks()
new
set regexpengine=1
call Regex_Mark()
call Regex_Mark_Verymagic()
set regexpengine=2
call Regex_Mark()
call Regex_Mark_Verymagic()
bwipe!
endfunc