Pass through retlist for print_ir() output too.

src/libfsm/print.c

@@ -358,11 +358,6 @@ fsm_print(FILE *f, const struct fsm *fsm,
 		}
 	}
 
-	if (print_ir != NULL) {
-		r = print_ir(f, opt, hooks, ir);
-		goto done;
-	}
-
 	/*
 	 * We're building the retlist here based on the ir.
 	 * I think we could build the retlist earlier instead,
@@ -377,6 +372,12 @@ fsm_print(FILE *f, const struct fsm *fsm,
 		goto error;
 	}
 
+	if (print_ir != NULL) {
+		r = print_ir(f, opt, hooks, &retlist, ir);
+		free_retlist(&retlist);
+		goto done;
+	}
+
 	a = zero;
 
 	/* TODO: non-const a */

src/libfsm/print.h

@@ -61,6 +61,7 @@ typedef int fsm_print_f(FILE *f,
 typedef int ir_print_f(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct ret_list *retlist,
 	const struct ir *ir);
 
 typedef int vm_print_f(FILE *f,

src/libfsm/print/c.c

@@ -514,6 +514,7 @@ int
 fsm_print_c(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct ret_list *retlist,
 	const struct ir *ir)
 {
 	const char *prefix;
@@ -523,6 +524,10 @@ fsm_print_c(FILE *f,
 	assert(hooks != NULL);
 	assert(ir != NULL);
 
+	/* XXX: it would actually make sense to use the retlist here,
+	 * but my plan is to remove the ir-based C codegen anyway */
+	(void) retlist;
+
 	if (opt->prefix != NULL) {
 		prefix = opt->prefix;
 	} else {

src/libfsm/print/irdot.c

@@ -329,6 +329,7 @@ int
 fsm_print_ir(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct ret_list *retlist,
 	const struct ir *ir)
 {
 	size_t i;
@@ -338,6 +339,8 @@ fsm_print_ir(FILE *f,
 	assert(hooks != NULL);
 	assert(ir != NULL);
 
+	(void) retlist;
+
 	fprintf(f, "# generated\n");
 	fprintf(f, "digraph G {\n");
 

src/libfsm/print/irjson.c

@@ -219,6 +219,7 @@ int
 fsm_print_irjson(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct ret_list *retlist,
 	const struct ir *ir)
 {
 	size_t i;
@@ -228,6 +229,8 @@ fsm_print_irjson(FILE *f,
 	assert(hooks != NULL);
 	assert(ir != NULL);
 
+	(void) retlist;
+
 	fprintf(f, "{\n");
 
 	fprintf(f, "\t\"start\": %u,\n", ir->start);