updated for version 7.3.1217
Problem: New regexp engine: Can't handle \%[[ao]]. (Yukihiro Nakadaira)
Solution: Support nested atoms inside \%[].
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index fc87e39..f11c01a 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -1150,13 +1150,16 @@
int n;
/* \%[abc] */
- for (n = 0; (c = getchr()) != ']'; ++n)
+ for (n = 0; (c = peekchr()) != ']'; ++n)
{
if (c == NUL)
EMSG2_RET_FAIL(_(e_missing_sb),
reg_magic == MAGIC_ALL);
- EMIT(c);
+ /* recursive call! */
+ if (nfa_regatom() == FAIL)
+ return FAIL;
}
+ getchr(); /* get the ] */
if (n == 0)
EMSG2_RET_FAIL(_(e_empty_sb),
reg_magic == MAGIC_ALL);
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 0cabcdf..061f1f1 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -366,6 +366,7 @@
:call add(tl, [2, '\%[bar]x', 'barxx', 'barx'])
:call add(tl, [2, '\%[bar]x', 'bxx', 'bx'])
:call add(tl, [2, '\%[bar]x', 'xxx', 'x'])
+:call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar'])
:"
:"""" Alternatives, must use first longest match
:call add(tl, [2, 'goo\|go', 'google', 'goo'])
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index fda5892..7021d18 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -836,6 +836,9 @@
OK 0 - \%[bar]x
OK 1 - \%[bar]x
OK 2 - \%[bar]x
+OK 0 - b\%[[ao]r]
+OK 1 - b\%[[ao]r]
+OK 2 - b\%[[ao]r]
OK 0 - goo\|go
OK 1 - goo\|go
OK 2 - goo\|go
diff --git a/src/version.c b/src/version.c
index e1c4ebc..86f8a85 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1217,
+/**/
1216,
/**/
1215,
