Permalink
Browse files

patch 7.4.2354

Problem:    The example that explains nested backreferences does not work
            properly with the new regexp engine. (Harm te Hennepe)
Solution:   Also save the end position when adding a state. (closes #990)
  • Loading branch information...
1 parent 2931f2a commit d563883a1fb5ec6cf4a2758c5e36ac1ff4e9bb3d @brammool brammool committed Sep 9, 2016
Showing with 24 additions and 17 deletions.
  1. +7 −17 src/regexp_nfa.c
  2. +15 −0 src/testdir/test_regexp_latin.vim
  3. +2 −0 src/version.c
View
@@ -4354,7 +4354,7 @@ addstate(
{
int subidx;
nfa_thread_T *thread;
- lpos_T save_lpos;
+ struct multipos save_multipos;
int save_in_use;
char_u *save_ptr;
int i;
@@ -4572,17 +4572,15 @@ addstate(
/* avoid compiler warnings */
save_ptr = NULL;
- save_lpos.lnum = 0;
- save_lpos.col = 0;
+ vim_memset(&save_multipos, 0, sizeof(save_multipos));
/* Set the position (with "off" added) in the subexpression. Save
* and restore it when it was in use. Otherwise fill any gap. */
if (REG_MULTI)
{
if (subidx < sub->in_use)
{
- save_lpos.lnum = sub->list.multi[subidx].start_lnum;
- save_lpos.col = sub->list.multi[subidx].start_col;
+ save_multipos = sub->list.multi[subidx];
save_in_use = -1;
}
else
@@ -4640,10 +4638,7 @@ addstate(
if (save_in_use == -1)
{
if (REG_MULTI)
- {
- sub->list.multi[subidx].start_lnum = save_lpos.lnum;
- sub->list.multi[subidx].start_col = save_lpos.col;
- }
+ sub->list.multi[subidx] = save_multipos;
else
sub->list.line[subidx].start = save_ptr;
}
@@ -4707,8 +4702,7 @@ addstate(
sub->in_use = subidx + 1;
if (REG_MULTI)
{
- save_lpos.lnum = sub->list.multi[subidx].end_lnum;
- save_lpos.col = sub->list.multi[subidx].end_col;
+ save_multipos = sub->list.multi[subidx];
if (off == -1)
{
sub->list.multi[subidx].end_lnum = reglnum + 1;
@@ -4728,8 +4722,7 @@ addstate(
save_ptr = sub->list.line[subidx].end;
sub->list.line[subidx].end = reginput + off;
/* avoid compiler warnings */
- save_lpos.lnum = 0;
- save_lpos.col = 0;
+ vim_memset(&save_multipos, 0, sizeof(save_multipos));
}
subs = addstate(l, state->out, subs, pim, off);
@@ -4742,10 +4735,7 @@ addstate(
sub = &subs->norm;
if (REG_MULTI)
- {
- sub->list.multi[subidx].end_lnum = save_lpos.lnum;
- sub->list.multi[subidx].end_col = save_lpos.col;
- }
+ sub->list.multi[subidx] = save_multipos;
else
sub->list.line[subidx].end = save_ptr;
sub->in_use = save_in_use;
@@ -38,3 +38,18 @@ func Test_recursive_substitute()
call setwinvar(1, 'myvar', 1)
bwipe!
endfunc
+
+func Test_nested_backrefs()
+ " Check example in change.txt.
+ new
+ for re in range(0, 2)
+ exe 'set re=' . re
+ call setline(1, 'aa ab x')
+ 1s/\(\(a[a-d] \)*\)\(x\)/-\1- -\2- -\3-/
+ call assert_equal('-aa ab - -ab - -x-', getline(1))
+
+ call assert_equal('-aa ab - -ab - -x-', substitute('aa ab x', '\(\(a[a-d] \)*\)\(x\)', '-\1- -\2- -\3-', ''))
+ endfor
+ bwipe!
+ set re=0
+endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2354,
+/**/
2353,
/**/
2352,

0 comments on commit d563883

Please sign in to comment.