lx: Ensure prefix.api & prefix.lx are used in the generated code.

In some cases this was hardcoding "lx_" in the generated code, which
could lead to build failures if 'lx -e' was used to override the default
prefix.

Author: silentbicycle

src/lx/print/c.c

@@ -454,7 +454,7 @@ print_io(FILE *f, const struct fsm_options *opt)
 	}
 
 	fprintf(f, "static int\n");
-	fprintf(f, "lx_advance_end(struct lx *lx, int c)\n");
+	fprintf(f, "%sadvance_end(struct %slx *lx, int c)\n", prefix.api, prefix.lx);
 	fprintf(f, "{\n");
 	if (~api_exclude & API_POS) {
 		fprintf(f, "\tlx->end.byte++;\n");
@@ -498,7 +498,7 @@ print_io(FILE *f, const struct fsm_options *opt)
 		fprintf(f, "inline\n");
 		fprintf(f, "#endif\n");
 		fprintf(f, "static int\n");
-		fprintf(f, "lx_getc(struct %slx *lx)\n", prefix.lx);
+		fprintf(f, "%sgetc(struct %slx *lx)\n", prefix.api, prefix.lx);
 		fprintf(f, "{\n");
 		fprintf(f, "\tint c;\n");
 		fprintf(f, "\n");
@@ -520,7 +520,7 @@ print_io(FILE *f, const struct fsm_options *opt)
 
 		/* FIXME: This should distinguish between alloc failure
 		 * and EOF, but will require layers of interface changes. */
-		fprintf(f, "\tif (!lx_advance_end(lx, c)) { return EOF; }\n");
+		fprintf(f, "\tif (!%sadvance_end(lx, c)) { return EOF; }\n", prefix.api);
 		fprintf(f, "\n");
 
 		fprintf(f, "\treturn c;\n");
@@ -529,13 +529,13 @@ print_io(FILE *f, const struct fsm_options *opt)
 
 		/* Add an implementation of fsm_getc that calls back
 		 * into lx_getc with the lx handle. */
-		fprintf(f, "/* This wrapper adapts calling lx_getc to the interface\n");
+		fprintf(f, "/* This wrapper adapts calling %sgetc to the interface\n", prefix.api);
 		fprintf(f, " * in libfsm's generated code. */\n");
 		fprintf(f, "static int\n");
 		fprintf(f, "fsm_getc(void *getc_opaque)\n");
 		fprintf(f, "{\n");
 
-		fprintf(f, "\treturn lx_getc((struct lx *)getc_opaque);\n");
+		fprintf(f, "\treturn %sgetc((struct %slx *)getc_opaque);\n", prefix.api, prefix.api);
 		fprintf(f, "}\n");
 		fprintf(f, "\n");
 		break;
@@ -545,7 +545,7 @@ print_io(FILE *f, const struct fsm_options *opt)
 		/* When libfsm's generated code advances a character, update
 		 * lx's token name buffer and position bookkeeping. */
 		fprintf(f, "#ifndef FSM_ADVANCE_HOOK\n");
-		fprintf(f, "#define FSM_ADVANCE_HOOK(C) if (!lx_advance_end(lx, C)) { return %sERROR; }\n", prefix.tok);
+		fprintf(f, "#define FSM_ADVANCE_HOOK(C) if (!%sadvance_end(lx, C)) { return %sERROR; }\n", prefix.api, prefix.tok);
 		fprintf(f, "#endif\n");
 		fprintf(f, "\n");
 		break;

src/lx/print/dump.c

@@ -68,12 +68,12 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 	fprintf(f, "main(int argc, char *argv[])\n");
 	fprintf(f, "{\n");
 
-	fprintf(f, "\tenum lx_token t;\n");
-	fprintf(f, "\tstruct lx lx = { 0 };\n");
+	fprintf(f, "\tenum %stoken t;\n", prefix.api);
+	fprintf(f, "\tstruct %slx lx = { 0 };\n", prefix.lx);
 
 	switch (opt->io) {
 	case FSM_IO_GETC:
-		fprintf(f, "\tint (*lgetc)(struct lx *lx);\n");
+		fprintf(f, "\tint (*lgetc)(struct %slx *lx);\n", prefix.lx);
 		fprintf(f, "\tvoid *getc_opaque;\n");
 		break;
 
@@ -135,7 +135,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 
 	switch (api_getc) {
 	case API_FGETC:
-		fprintf(f, "\tlgetc = lx_fgetc;\n");
+		fprintf(f, "\tlgetc = %sfgetc;\n", prefix.api);
 		fprintf(f, "\tgetc_opaque = stdin;\n");
 		fprintf(f, "\n");
 		break;
@@ -144,7 +144,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 		fprintf(f, "\ts = argv[1];\n");
 		fprintf(f, "\n");
 
-		fprintf(f, "\tlgetc = lx_sgetc;\n");
+		fprintf(f, "\tlgetc = %ssgetc;\n", prefix.api);
 		fprintf(f, "\tgetc_opaque = &s;\n");
 		fprintf(f, "\n");
 		break;
@@ -154,7 +154,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 		fprintf(f, "\tarr.len = strlen(arr.p);\n");
 		fprintf(f, "\n");
 
-		fprintf(f, "\tlgetc = lx_agetc;\n");
+		fprintf(f, "\tlgetc = %sagetc;\n", prefix.api);
 		fprintf(f, "\tgetc_opaque = &arr;\n");
 		fprintf(f, "\n");
 		break;
@@ -167,13 +167,13 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 		fprintf(f, "\td.fd    = fileno(stdin);\n");
 		fprintf(f, "\n");
 
-		fprintf(f, "\tlgetc = lx_dgetc;\n");
+		fprintf(f, "\tlgetc = %sdgetc;\n", prefix.api);
 		fprintf(f, "\tgetc_opaque = &d;\n");
 		fprintf(f, "\n");
 		break;
 	}
 
-	fprintf(f, "\tlx_init(&lx);\n");
+	fprintf(f, "\t%sinit(&lx);\n", prefix.api);
 	fprintf(f, "\n");
 
 	switch (opt->io) {
@@ -203,9 +203,9 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 
 		if (~api_exclude & API_BUF) {
 			fprintf(f, "\tlx.buf_opaque = &buf;\n");
-			fprintf(f, "\tlx.push       = lx_dynpush;\n");
-			fprintf(f, "\tlx.clear      = lx_dynclear;\n");
-			fprintf(f, "\tlx.free       = lx_dynfree;\n");
+			fprintf(f, "\tlx.push       = %sdynpush;\n", prefix.api);
+			fprintf(f, "\tlx.clear      = %sdynclear;\n", prefix.api);
+			fprintf(f, "\tlx.free       = %sdynfree;\n", prefix.api);
 		}
 		fprintf(f, "\n");
 		break;
@@ -218,8 +218,8 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 
 		if (~api_exclude & API_BUF) {
 			fprintf(f, "\tlx.buf_opaque = &buf;\n");
-			fprintf(f, "\tlx.push       = lx_fixedpush;\n");
-			fprintf(f, "\tlx.clear      = lx_fixedclear;\n");
+			fprintf(f, "\tlx.push       = %sfixedpush;\n", prefix.api);
+			fprintf(f, "\tlx.clear      = %sfixedclear;\n", prefix.api);
 			fprintf(f, "\tlx.free       = NULL;\n");
 		}
 		fprintf(f, "\n");
@@ -231,7 +231,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 	fprintf(f, "\t\tconst char *q;\n");
 	fprintf(f, "\n");
 
-	fprintf(f, "\t\tt = lx_next(&lx);\n");
+	fprintf(f, "\t\tt = %snext(&lx);\n", prefix.api);
 	fprintf(f, "\n");
 
 	switch (api_tokbuf) {
@@ -278,7 +278,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 	fprintf(f, "\n");
 
 	fprintf(f, "\t\tcase TOK_ERROR:\n");
-	fprintf(f, "\t\t\tperror(\"lx_next\");\n");
+	fprintf(f, "\t\t\tperror(\"%snext\");\n", prefix.api);
 	fprintf(f, "\t\t\tbreak;\n");
 	fprintf(f, "\n");
 
@@ -291,7 +291,7 @@ lx_print_dump(FILE *f, const struct ast *ast, const struct fsm_options *opt)
 
 	fprintf(f, "\t\tdefault:\n");
 	if (~api_exclude & API_NAME) {
-		fprintf(f, "\t\t\tprintf(\"<%%s\", lx_name(t));\n");
+		fprintf(f, "\t\t\tprintf(\"<%%s\", %sname(t));\n", prefix.api);
 		fprintf(f, "\t\t\tdump_buf(q, l);\n");
 		fprintf(f, "\t\t\tprintf(\">\\n\");\n");
 	} else {