1 files changed, 69 insertions, 57 deletions

diff --git a/src/search.c b/src/search.c
index 5ef2179..856d079 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2025 Robin Haberkorn
+ * Copyright (C) 2012-2026 Robin Haberkorn
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -537,7 +537,7 @@ teco_pattern2regexp(teco_string_t *pattern, teco_machine_qregspec_t *qreg_machin
 	if (state == TECO_SEARCH_STATE_ALT)
 		teco_string_append_c(&re, ')');
 
-	g_assert(!teco_string_contains(&re, '\0'));
+	g_assert(!teco_string_contains(re, '\0'));
 	return g_steal_pointer(&re.data) ? : g_strdup("");
 }
 
@@ -696,7 +696,7 @@ teco_do_search(GRegex *re, gsize from, gsize to, gint *count, GError **error)
 }
 
 static gboolean
-teco_state_search_process(teco_machine_main_t *ctx, const teco_string_t *str, gsize new_chars, GError **error)
+teco_state_search_process(teco_machine_main_t *ctx, teco_string_t str, gsize new_chars, GError **error)
 {
 	/* FIXME: Should G_REGEX_OPTIMIZE be added under certain circumstances? */
 	GRegexCompileFlags flags = G_REGEX_MULTILINE | G_REGEX_DOTALL;
@@ -741,10 +741,9 @@ teco_state_search_process(teco_machine_main_t *ctx, const teco_string_t *str, gs
 	qreg_machine = teco_machine_qregspec_new(TECO_QREG_REQUIRED, ctx->qreg_table_locals, FALSE);
 
 	g_autoptr(GRegex) re = NULL;
-	teco_string_t pattern = *str;
 	g_autofree gchar *re_pattern;
 	/* NOTE: teco_pattern2regexp() modifies str pointer */
-	re_pattern = teco_pattern2regexp(&pattern, qreg_machine,
+	re_pattern = teco_pattern2regexp(&str, qreg_machine,
 	                                 ctx->expectstring.machine.codepage, FALSE, error);
 	if (!re_pattern)
 		return FALSE;
@@ -829,7 +828,7 @@ failure:
 }
 
 static teco_state_t *
-teco_state_search_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_search_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
@@ -837,14 +836,14 @@ teco_state_search_done(teco_machine_main_t *ctx, const teco_string_t *str, GErro
 	teco_qreg_t *search_reg = teco_qreg_table_find(&teco_qreg_table_globals, "_", 1);
 	g_assert(search_reg != NULL);
 
-	if (str->len > 0) {
+	if (str.len > 0) {
 		/* workaround: preserve selection (also on rubout) */
 		gint anchor = teco_interface_ssm(SCI_GETANCHOR, 0, 0);
 		if (teco_current_doc_must_undo())
 			undo__teco_interface_ssm(SCI_SETANCHOR, anchor, 0);
 
 		if (!search_reg->vtable->undo_set_string(search_reg, error) ||
-		    !search_reg->vtable->set_string(search_reg, str->data, str->len,
+		    !search_reg->vtable->set_string(search_reg, str.data, str.len,
 		                                    teco_default_codepage(), error))
 			return NULL;
 
@@ -853,7 +852,7 @@ teco_state_search_done(teco_machine_main_t *ctx, const teco_string_t *str, GErro
 		g_auto(teco_string_t) search_str = {NULL, 0};
 		if (!search_reg->vtable->get_string(search_reg, &search_str.data, &search_str.len,
 		                                    NULL, error) ||
-		    !teco_state_search_process(ctx, &search_str, search_str.len, error))
+		    !teco_state_search_process(ctx, search_str, search_str.len, error))
 			return NULL;
 	}
 
@@ -882,7 +881,6 @@ teco_state_search_done(teco_machine_main_t *ctx, const teco_string_t *str, GErro
 	TECO_DEFINE_STATE_EXPECTSTRING(NAME, \
 		.initial_cb = (teco_state_initial_cb_t)teco_state_search_initial, \
 		.expectstring.process_cb = teco_state_search_process, \
-		.expectstring.done_cb = NAME##_done, \
 		##__VA_ARGS__ \
 	)
 
@@ -956,7 +954,9 @@ teco_state_search_done(teco_machine_main_t *ctx, const teco_string_t *str, GErro
  * Changing the <pattern> results in the search being reperformed
  * from the beginning.
  */
-TECO_DEFINE_STATE_SEARCH(teco_state_search);
+TECO_DEFINE_STATE_SEARCH(teco_state_search,
+	.expectstring.done_cb = teco_state_search_done
+);
 
 static gboolean
 teco_state_search_all_initial(teco_machine_main_t *ctx, GError **error)
@@ -1015,7 +1015,7 @@ teco_state_search_all_initial(teco_machine_main_t *ctx, GError **error)
 }
 
 static teco_state_t *
-teco_state_search_all_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_search_all_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
@@ -1074,11 +1074,12 @@ teco_state_search_all_done(teco_machine_main_t *ctx, const teco_string_t *str, G
  * This is probably not very useful in practice, so it's not documented.
  */
 TECO_DEFINE_STATE_SEARCH(teco_state_search_all,
-	.initial_cb = (teco_state_initial_cb_t)teco_state_search_all_initial
+	.initial_cb = (teco_state_initial_cb_t)teco_state_search_all_initial,
+	.expectstring.done_cb = teco_state_search_all_done
 );
 
 static teco_state_t *
-teco_state_search_kill_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_search_kill_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
@@ -1157,10 +1158,12 @@ teco_state_search_kill_done(teco_machine_main_t *ctx, const teco_string_t *str,
 /*
  * ::FK is possible but doesn't make much sense, so it's undocumented.
  */
-TECO_DEFINE_STATE_SEARCH(teco_state_search_kill);
+TECO_DEFINE_STATE_SEARCH(teco_state_search_kill,
+	.expectstring.done_cb = teco_state_search_kill_done
+);
 
 static teco_state_t *
-teco_state_search_delete_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_search_delete_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
@@ -1200,37 +1203,50 @@ teco_state_search_delete_done(teco_machine_main_t *ctx, const teco_string_t *str
  * Searches for <pattern> just like the regular search command
  * (\fBS\fP) but when found deletes the entire occurrence.
  */
-TECO_DEFINE_STATE_SEARCH(teco_state_search_delete);
+TECO_DEFINE_STATE_SEARCH(teco_state_search_delete,
+	.expectstring.done_cb = teco_state_search_delete_done
+);
 
 static gboolean
 teco_state_replace_insert_initial(teco_machine_main_t *ctx, GError **error)
 {
-	if (ctx->flags.mode == TECO_MODE_NORMAL)
-		teco_machine_stringbuilding_set_codepage(&ctx->expectstring.machine,
-		                                         teco_interface_get_codepage());
+	if (ctx->flags.mode > TECO_MODE_NORMAL)
+		return TRUE;
+
+	/*
+	 * Overwrites teco_ranges set by the preceding search.
+	 * FIXME: Wastes undo tokens in teco_do_search().
+	 * Perhaps make this configurable in the state.
+	 */
+	sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0);
+	teco_undo_int(teco_ranges[0].from) = teco_interface_bytes2glyphs(pos);
+	teco_undo_guint(teco_ranges_count) = 1;
+
+	/*
+	 * Current document's encoding determines the behaviour of
+	 * string building constructs.
+	 */
+	teco_machine_stringbuilding_set_codepage(&ctx->expectstring.machine,
+	                                         teco_interface_get_codepage());
 	return TRUE;
 }
 
-/*
- * FIXME: Could be static
- */
-TECO_DEFINE_STATE_INSERT(teco_state_replace_insert,
+static TECO_DEFINE_STATE_INSERT(teco_state_replace_insert,
 	.initial_cb = (teco_state_initial_cb_t)teco_state_replace_insert_initial
 );
 
 static teco_state_t *
-teco_state_replace_ignore_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_ignore_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	return &teco_state_start;
 }
 
-/*
- * FIXME: Could be static
- */
-TECO_DEFINE_STATE_EXPECTSTRING(teco_state_replace_ignore);
+static TECO_DEFINE_STATE_EXPECTSTRING(teco_state_replace_ignore,
+	.expectstring.done_cb = teco_state_replace_ignore_done
+);
 
 static teco_state_t *
-teco_state_replace_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_replace_ignore;
@@ -1270,16 +1286,12 @@ teco_state_replace_done(teco_machine_main_t *ctx, const teco_string_t *str, GErr
  * immediately and interactively.
  */
 TECO_DEFINE_STATE_SEARCH(teco_state_replace,
-	.expectstring.last = FALSE
+	.expectstring.last = FALSE,
+	.expectstring.done_cb = teco_state_replace_done
 );
 
-/*
- * FIXME: TECO_DEFINE_STATE_INSERT() already defines a done_cb(),
- * so we had to name this differently.
- * Perhaps it simply shouldn't define it.
- */
 static teco_state_t *
-teco_state_replace_default_insert_done_overwrite(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_default_insert_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
@@ -1287,55 +1299,53 @@ teco_state_replace_default_insert_done_overwrite(teco_machine_main_t *ctx, const
 	teco_qreg_t *replace_reg = teco_qreg_table_find(&teco_qreg_table_globals, "-", 1);
 	g_assert(replace_reg != NULL);
 
-	if (str->len > 0) {
+	if (str.len > 0) {
 		if (!replace_reg->vtable->undo_set_string(replace_reg, error) ||
-		    !replace_reg->vtable->set_string(replace_reg, str->data, str->len,
+		    !replace_reg->vtable->set_string(replace_reg, str.data, str.len,
 		                                     teco_default_codepage(), error))
 			return NULL;
 	} else {
 		g_auto(teco_string_t) replace_str = {NULL, 0};
 		if (!replace_reg->vtable->get_string(replace_reg, &replace_str.data, &replace_str.len,
 		                                     NULL, error) ||
-		    (replace_str.len > 0 && !teco_state_insert_process(ctx, &replace_str, replace_str.len, error)))
+		    (replace_str.len > 0 && !teco_state_insert_process(ctx, replace_str, replace_str.len, error)))
 			return NULL;
 	}
 
+	sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0);
+	teco_undo_int(teco_ranges[0].to) = teco_interface_bytes2glyphs(pos);
 	return &teco_state_start;
 }
 
-/*
- * FIXME: Could be static
- */
-TECO_DEFINE_STATE_INSERT(teco_state_replace_default_insert,
-	.initial_cb = NULL,
-	.expectstring.done_cb = teco_state_replace_default_insert_done_overwrite
+static TECO_DEFINE_STATE_INSERT(teco_state_replace_default_insert,
+	.initial_cb = (teco_state_initial_cb_t)teco_state_replace_insert_initial,
+	.expectstring.done_cb = teco_state_replace_default_insert_done
 );
 
 static teco_state_t *
-teco_state_replace_default_ignore_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_default_ignore_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL ||
-	    !str->len)
+	    !str.len)
 		return &teco_state_start;
 
 	teco_qreg_t *replace_reg = teco_qreg_table_find(&teco_qreg_table_globals, "-", 1);
 	g_assert(replace_reg != NULL);
 
 	if (!replace_reg->vtable->undo_set_string(replace_reg, error) ||
-	    !replace_reg->vtable->set_string(replace_reg, str->data, str->len,
+	    !replace_reg->vtable->set_string(replace_reg, str.data, str.len,
 	                                     teco_default_codepage(), error))
 		return NULL;
 
 	return &teco_state_start;
 }
 
-/*
- * FIXME: Could be static
- */
-TECO_DEFINE_STATE_EXPECTSTRING(teco_state_replace_default_ignore);
+static TECO_DEFINE_STATE_EXPECTSTRING(teco_state_replace_default_ignore,
+	.expectstring.done_cb = teco_state_replace_default_ignore_done
+);
 
 static teco_state_t *
-teco_state_replace_default_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_default_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_replace_default_ignore;
@@ -1374,11 +1384,12 @@ teco_state_replace_default_done(teco_machine_main_t *ctx, const teco_string_t *s
  * register is implied instead.
  */
 TECO_DEFINE_STATE_SEARCH(teco_state_replace_default,
-	.expectstring.last = FALSE
+	.expectstring.last = FALSE,
+	.expectstring.done_cb = teco_state_replace_default_done
 );
 
 static teco_state_t *
-teco_state_replace_default_all_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_replace_default_all_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_replace_default_ignore;
@@ -1417,6 +1428,7 @@ teco_state_replace_default_all_done(teco_machine_main_t *ctx, const teco_string_
  * <to>.
  */
 TECO_DEFINE_STATE_SEARCH(teco_state_replace_default_all,
+	.initial_cb = (teco_state_initial_cb_t)teco_state_search_all_initial,
 	.expectstring.last = FALSE,
-	.initial_cb = (teco_state_initial_cb_t)teco_state_search_all_initial
+	.expectstring.done_cb = teco_state_replace_default_all_done
 );