Upstream sync for interpolation brace syntax

include/fsm/fsm.h

@@ -538,6 +538,15 @@ fsm_shortest(const struct fsm *fsm,
 	fsm_state_t start, fsm_state_t goal,
 	unsigned (*cost)(fsm_state_t from, fsm_state_t to, char c));
 
+/* HACK */
+typedef void
+fsm_eager_endid_cb(fsm_end_id_t id, void *opaque);
+void
+fsm_eager_endid_set_cb(struct fsm *fsm, fsm_eager_endid_cb *cb, void *opaque);
+
+void
+fsm_eager_endid_get_cb(const struct fsm *fsm, fsm_eager_endid_cb **cb, void **opaque);
+
 /*
  * Execute an FSM reading input from the user-specified callback fsm_getc().
  * fsm_getc() is passed the opaque pointer given, and is expected to return

include/fsm/print.h

@@ -37,6 +37,8 @@ enum fsm_print_lang {
 	FSM_PRINT_VMC,        /* ISO C90 code, VM style */
 	FSM_PRINT_VMDOT,      /* Graphviz Dot format, showing VM opcodes */
 
+	FSM_PRINT_CDATA,      /* C data tables and small interpreter */
+
 	FSM_PRINT_VMOPS_C,    /* VM opcodes as a datastructure */
 	FSM_PRINT_VMOPS_H,
 	FSM_PRINT_VMOPS_MAIN

src/libfsm/exec.c

@@ -103,10 +103,12 @@ fsm_exec(const struct fsm *fsm,
 
 	/* TODO: pass struct of callbacks to call during each event; transitions etc */
 
+#if EXPENSIVE_CHECKS
 	if (!fsm_all(fsm, fsm_isdfa)) {
 		errno = EINVAL;
 		return -1;
 	}
+#endif
 
 	if (!fsm_getstart(fsm, &state)) {
 		errno = EINVAL;

src/libfsm/print.c

@@ -328,6 +328,8 @@ fsm_print(FILE *f, const struct fsm *fsm,
 	case FSM_PRINT_VMC:        print_vm  = fsm_print_vmc;        break;
 	case FSM_PRINT_VMDOT:      print_vm  = fsm_print_vmdot;      break;
 
+	case FSM_PRINT_CDATA:      print_ir  = fsm_print_cdata;      break;
+
 	case FSM_PRINT_VMOPS_C:    print_vm  = fsm_print_vmops_c;    break;
 	case FSM_PRINT_VMOPS_H:    print_vm  = fsm_print_vmops_h;    break;
 	case FSM_PRINT_VMOPS_MAIN: print_vm  = fsm_print_vmops_main; break;
@@ -364,7 +366,7 @@ fsm_print(FILE *f, const struct fsm *fsm,
 	}
 
 	if (print_ir != NULL) {
-		r = print_ir(f, opt, hooks, ir);
+		r = print_ir(f, fsm->alloc, opt, hooks, ir);
 		goto done;
 	}
 

src/libfsm/print.h

@@ -62,6 +62,7 @@ typedef int fsm_print_f(FILE *f,
 	const struct fsm *fsm);
 
 typedef int ir_print_f(FILE *f,
+	const struct fsm_alloc *alloc,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
 	const struct ir *ir);
@@ -89,6 +90,7 @@ vm_print_f fsm_print_llvm;
 vm_print_f fsm_print_rust;
 vm_print_f fsm_print_sh;
 vm_print_f fsm_print_vmc;
+ir_print_f fsm_print_cdata;
 
 vm_print_f fsm_print_vmdot;
 vm_print_f fsm_print_vmops_c;

src/libfsm/print/Makefile

@@ -11,6 +11,7 @@ SRC += src/libfsm/print/irdot.c
 SRC += src/libfsm/print/irjson.c
 SRC += src/libfsm/print/json.c
 SRC += src/libfsm/print/llvm.c
+SRC += src/libfsm/print/cdata.c
 SRC += src/libfsm/print/rust.c
 SRC += src/libfsm/print/sh.c
 SRC += src/libfsm/print/vmasm.c

src/libfsm/print/c.c

@@ -542,11 +542,13 @@ fsm_print_c_body(FILE *f, const struct ir *ir,
 
 int
 fsm_print_c(FILE *f,
+	const struct fsm_alloc *alloc,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
 	const struct ir *ir)
 {
 	const char *prefix;
+	(void)alloc;
 
 	assert(f != NULL);
 	assert(opt != NULL);