updated for version 7.3.1055
Problem: Negated collection does not match newline.
Solution: Handle newline differently. (Hiroshi Shirosaki)
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index bb8c982..aa6c56e 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1203,13 +1203,6 @@
}
mb_ptr_adv(regparse);
- if (extra == ADD_NL) /* \_[] also matches \n */
- {
- EMIT(reg_string ? NL : NFA_NEWL);
- TRY_NEG();
- EMIT_GLUE();
- }
-
/* skip the trailing ] */
regparse = endp;
mb_ptr_adv(regparse);
@@ -1219,6 +1212,14 @@
EMIT(NFA_END_NEG_RANGE);
EMIT(NFA_CONCAT);
}
+
+ /* \_[] also matches \n but it's not negated */
+ if (extra == ADD_NL)
+ {
+ EMIT(reg_string ? NL : NFA_NEWL);
+ EMIT(NFA_OR);
+ }
+
return OK;
} /* if exists closing ] */
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 192d456..0c55173 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -344,9 +344,13 @@
:call add(tl, [0, '\(<<\)\@1<=span.', 'xxspanxxxx<spanxx<<spanyyy'])
:call add(tl, [0, '\(<<\)\@2<=span.', 'xxspanxxxx<spanxx<<spanyyy', 'spany', '<<'])
:"
-:"""" Run the tests
+:"""" "\_" prepended negated collection matches EOL
+:call add(tl, [2, '\_[^8-9]\+', "asfi\n9888", "asfi\n"])
+:call add(tl, [2, '\_[^a]\+', "asfi\n9888", "sfi\n9888"])
:"
:"
+:"""" Run the tests
+:"
:for t in tl
: let re = t[0]
: let pat = t[1]
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 74db0bd..7b81853 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -731,6 +731,12 @@
OK 1 - \(<<\)\@1<=span.
OK 0 - \(<<\)\@2<=span.
OK 1 - \(<<\)\@2<=span.
+OK 0 - \_[^8-9]\+
+OK 1 - \_[^8-9]\+
+OK 2 - \_[^8-9]\+
+OK 0 - \_[^a]\+
+OK 1 - \_[^a]\+
+OK 2 - \_[^a]\+
192.168.0.1
192.168.0.1
192.168.0.1
diff --git a/src/version.c b/src/version.c
index 795e175..651c64c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1055,
+/**/
1054,
/**/
1053,