From: NeilBrown <neil@brown.name>
Date: Tue, 15 Aug 2023 12:18:18 +0000 (+1000)
Subject: rexel: fix bug with capturing groups.
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=71a8652ffa186172adcd4067af15769dba73d538;p=edlib.git

rexel: fix bug with capturing groups.

The post-parse editing of group matches to put all the right branches
in place was messing up capture requests.

Signed-off-by: NeilBrown <neil@brown.name>
---

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 0f5f91a4..1644c25c 100644
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -21,7 +21,7 @@ the file.
       final non-eol item
 - [X] resolve fixme around wrap_margin when splitting
 - [X] resolve fixme reguarding margin in find_curs
-- [ ] search "\brl([123]*|end)\b" replace "ri\1" does rlend -> rirlend
+- [X] search "\brl([123]*|end)\b" replace "ri\1" does rlend -> rirlend
 - [ ] when should lib-renderline call measure_line? Only when asked?
       Or whenever content, width, scale change?
 - [ ] When is left_margin used?  Can I use it for hanging indent?  If
diff --git a/rexel.c b/rexel.c
index 6399ba7f..204309ea 100644
--- a/rexel.c
+++ b/rexel.c
@@ -1966,8 +1966,8 @@ static int parse_prefix(struct parse_state *st safe)
 
 static bool parse_re(struct parse_state *st safe, int capture_flag)
 {
-	int re_start = st->next;
-	int start = re_start;
+	int re_start;
+	int start;
 	int save_mod = st->mod;
 	int ret;
 	int capture = st->capture;
@@ -2000,6 +2000,8 @@ static bool parse_re(struct parse_state *st safe, int capture_flag)
 		st->capture += 1;
 	}
 	capture_start = capture_max = st->capture;
+	start = re_start = st->next;
+
 	while ((ret = parse_branch(st)) != 0 && *st->patn == '|') {
 		st->patn += 1;
 		relocate(st, start, 1);
@@ -2505,6 +2507,8 @@ static struct test {
 	{ "a[^\\s123]+b", " a b a12b axyb ", 0, 10, 4},
 	{ "([\\w\\d]+)\\s*=\\s*(.*[^\\s])", " name = some value ", 0, 1, 17,
 	 "\\1,\\2", "name,some value"},
+	{ "\\brl([123]*|end)\\b", " ->rlend = ", 0, 3, 5,
+	 "->ri\\1 = ", "->riend = "},
 	{ "?|foo(bar)|(bat)foo", "foobar", 0, 0, 6, "\\1", "bar"},
 	{ "?|foo(bar)|(bat)foo", "batfoo", 0, 0, 6, "\\1", "bat"},
 	// compare greedy and non-greedy