1 files changed, 25 insertions, 17 deletions

diff --git a/src/goto-commands.c b/src/goto-commands.c
index 05d495f..aad3668 100644
--- a/src/goto-commands.c
+++ b/src/goto-commands.c
@@ -35,8 +35,8 @@
 #include "goto.h"
 #include "goto-commands.h"
 
-TECO_DECLARE_STATE(teco_state_blockcomment);
-TECO_DECLARE_STATE(teco_state_eolcomment);
+static teco_state_t teco_state_blockcomment;
+static teco_state_t teco_state_eolcomment;
 
 /**
  * In TECO_MODE_PARSE_ONLY_GOTO mode, we remain in parse-only mode
@@ -75,7 +75,7 @@ teco_state_label_input(teco_machine_main_t *ctx, gunichar chr, GError **error)
 				teco_goto_table_undo_remove(&ctx->goto_table, ctx->goto_label.data, ctx->goto_label.len);
 
 			if (teco_goto_skip_label.len > 0 &&
-			    !teco_string_cmp(&ctx->goto_label, teco_goto_skip_label.data, teco_goto_skip_label.len)) {
+			    !teco_string_cmp(ctx->goto_label, teco_goto_skip_label.data, teco_goto_skip_label.len)) {
 				teco_undo_string_own(teco_goto_skip_label);
 				memset(&teco_goto_skip_label, 0, sizeof(teco_goto_skip_label));
 				teco_undo_gssize(teco_goto_backup_pc) = -1;
@@ -113,16 +113,17 @@ teco_state_label_input(teco_machine_main_t *ctx, gunichar chr, GError **error)
 }
 
 TECO_DEFINE_STATE(teco_state_label,
-	.style = SCE_SCITECO_LABEL
+	.style = SCE_SCITECO_LABEL,
+	.input_cb = (teco_state_input_cb_t)teco_state_label_input
 );
 
 static teco_state_t *
-teco_state_goto_done(teco_machine_main_t *ctx, const teco_string_t *str, GError **error)
+teco_state_goto_done(teco_machine_main_t *ctx, teco_string_t str, GError **error)
 {
 	if (ctx->flags.mode > TECO_MODE_NORMAL)
 		return &teco_state_start;
 
-	if (!str->len) {
+	if (!str.len) {
 		/* you can still write @O/,/, though... */
 		g_set_error_literal(error, TECO_ERROR, TECO_ERROR_FAILED,
 		                    "No labels given for <O>");
@@ -140,9 +141,9 @@ teco_state_goto_done(teco_machine_main_t *ctx, const teco_string_t *str, GError
 	 */
 	teco_string_t label = {NULL, 0};
 	while (value >= 0) {
-		label.data = label.data ? label.data+label.len+1 : str->data;
-		const gchar *p = label.data ? memchr(label.data, ',', str->len - (label.data - str->data)) : NULL;
-		label.len = p ? p - label.data : str->len - (label.data - str->data);
+		label.data = label.data ? label.data+label.len+1 : str.data;
+		const gchar *p = label.data ? memchr(label.data, ',', str.len - (label.data - str.data)) : NULL;
+		label.len = p ? p - label.data : str.len - (label.data - str.data);
 
 		value--;
 
@@ -177,7 +178,7 @@ teco_state_goto_done(teco_machine_main_t *ctx, const teco_string_t *str, GError
 /* in cmdline.c */
 gboolean teco_state_goto_process_edit_cmd(teco_machine_main_t *ctx, teco_machine_t *parent_ctx,
                                           gunichar chr, GError **error);
-gboolean teco_state_goto_insert_completion(teco_machine_main_t *ctx, const teco_string_t *str,
+gboolean teco_state_goto_insert_completion(teco_machine_main_t *ctx, teco_string_t str,
                                            GError **error);
 
 /*$ "O" ":O" goto
@@ -221,7 +222,8 @@ gboolean teco_state_goto_insert_completion(teco_machine_main_t *ctx, const teco_
  */
 TECO_DEFINE_STATE_EXPECTSTRING(teco_state_goto,
 	.process_edit_cmd_cb = (teco_state_process_edit_cmd_cb_t)teco_state_goto_process_edit_cmd,
-	.insert_completion_cb = (teco_state_insert_completion_cb_t)teco_state_goto_insert_completion
+	.insert_completion_cb = (teco_state_insert_completion_cb_t)teco_state_goto_insert_completion,
+	.expectstring.done_cb = teco_state_goto_done
 );
 
 /**
@@ -242,28 +244,34 @@ TECO_DEFINE_STATE_EXPECTSTRING(teco_state_goto,
 	)
 
 static teco_state_t *
-teco_state_blockcomment_star_input(teco_machine_main_t *ctx, gunichar chr, GError **error)
+teco_state_blockcomment_star_input(teco_machine_t *ctx, gunichar chr, GError **error)
 {
 	return chr == '!' ? &teco_state_start : &teco_state_blockcomment;
 }
 
-TECO_DEFINE_STATE_COMMENT(teco_state_blockcomment_star);
+static TECO_DEFINE_STATE_COMMENT(teco_state_blockcomment_star,
+	.input_cb = teco_state_blockcomment_star_input
+);
 
 static teco_state_t *
-teco_state_blockcomment_input(teco_machine_main_t *ctx, gunichar chr, GError **error)
+teco_state_blockcomment_input(teco_machine_t *ctx, gunichar chr, GError **error)
 {
 	return chr == '*' ? &teco_state_blockcomment_star : &teco_state_blockcomment;
 }
 
-TECO_DEFINE_STATE_COMMENT(teco_state_blockcomment);
+static TECO_DEFINE_STATE_COMMENT(teco_state_blockcomment,
+	.input_cb = teco_state_blockcomment_input
+);
 
 /*
  * `!!` line comments are inspired by TECO-64.
  */
 static teco_state_t *
-teco_state_eolcomment_input(teco_machine_main_t *ctx, gunichar chr, GError **error)
+teco_state_eolcomment_input(teco_machine_t *ctx, gunichar chr, GError **error)
 {
 	return chr == '\n' ? &teco_state_start : &teco_state_eolcomment;
 }
 
-TECO_DEFINE_STATE_COMMENT(teco_state_eolcomment);
+static TECO_DEFINE_STATE_COMMENT(teco_state_eolcomment,
+	.input_cb = teco_state_eolcomment_input
+);