Added basic support of Graphviz output

lib/dfa.c

@@ -36,7 +36,6 @@
 
 static int dfa_state_set_deadend(struct dfa *dfa, size_t state, int deadend);
 static int dfa_state_calc_deadend(struct dfa *dfa, size_t state);
-static void dfa_print(const struct dfa *dfa);
 
 static int max_to_bps(size_t max)
 {
@@ -1086,20 +1085,22 @@
 }
 
 
-static void dfa_print_char(const unsigned char a)
+static void dfa_print_char(FILE *stream, const unsigned char a)
 {
 	if (isprint(a)) {
 		if (a == '"' || a == '-' || a == '\\')
-			printf("\\");
-		printf("%c", a);
+			fprintf(stream, "\\");
+		fprintf(stream, "%c", a);
 	} else {
-		printf("0x%02X", a);
+		fprintf(stream, "0x%02X", a);
 	}
 }
 
-void dfa_print(const struct dfa *src)
+void dfa_graphviz(FILE *stream, const struct dfa *src)
 {
-	printf("#dfa states: %zu, first: %zu \n", src->state_cnt, src->first_index);
+	fprintf(stream, "digraph DFA{\n");
+	fprintf(stream, "#dfa states: %zu, first: %zu \n",
+		src->state_cnt, src->first_index);
 
 	for (size_t i = 0; i < src->state_cnt; i++) {
 		printf("{node [shape = %s, %s]; \"%zu\";}\n",
@@ -1109,11 +1110,9 @@
 	}
 
 	for (size_t i = 0; i < src->state_cnt; i++) {
-		struct to_and_symb {size_t to; unsigned char symb;}	qu[256];
+		struct to_and_symb {size_t to; unsigned char symb;} qu[256];
 
-
-
-		printf("#node[%zu]\n", i);
+		fprintf(stream, "#node[%zu]\n", i);
 		for (unsigned int j = 0; j < 256; j++) {
 			qu[j].to = dfa_get_trans(src, i, j);
 
@@ -1148,11 +1147,12 @@
 
 			unsigned int ub, db;
 			int started = 0;
-			printf(" \"%zu\" -> \"%zu\" [label = \"", i, qu[d_bnd].to);
+			fprintf(stream, " \"%zu\" -> \"%zu\" [label = \"",
+				i, qu[d_bnd].to);
 			if (total_trans > 1)
-				printf("[");
+				fprintf(stream, "[");
 			if (total_trans > 256/2 && total_trans != 256)
-				printf("^");
+				fprintf(stream, "^");
 			for (db = 0; db < 256;)
 				if (symbs[db] == 0) {
 					db++;
@@ -1161,19 +1161,19 @@
 
 					ub--;
 					if (db == ub) {
-						dfa_print_char(db);
+						dfa_print_char(stream, db);
 					} else if (ub - db == 1) {
-						dfa_print_char(db);
-						dfa_print_char(ub);
+						dfa_print_char(stream, db);
+						dfa_print_char(stream, ub);
 					} else {
-						dfa_print_char(db);
-						printf("-");
+						dfa_print_char(stream, db);
+						fprintf(stream, "-");
 						if (isprint(ub)) {
 							if (ub == '\\' || ub == '"' || ub == ']')
-								printf("\\");
-							printf("%c", ub);
+								fprintf(stream, "\\");
+							fprintf(stream, "%c", ub);
 						} else {
-							printf("\\x%02X", ub);
+							fprintf(stream, "\\x%02X", ub);
 						}
 					}
 							if (!started) {
@@ -1184,11 +1184,13 @@
 
 			j = u_bnd - 1;
 			if (total_trans > 1)
-				printf("]");
-			printf("\"];\n");
+				fprintf(stream, "]");
+			fprintf(stream, "\"];\n");
 		}
 
 	}
+
+	fprintf(stream, "}\n");
 }
 
 #define QUEUE_BLOCK_SIZE	(4096 / sizeof(size_t) - 3)

lib/dfa.h

@@ -14,6 +14,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <stdio.h>
 
 /** flag that shows if the state is final */
 #define DFA_FLAG_FINAL		(0x01)
@@ -284,4 +285,12 @@ int dfa_save_to_file(const struct dfa *dfa, char *filename);
  */
 int dfa_load_from_file(struct dfa *dfa, char *filename);
 
+/**
+ * Print the dfa in Graphviz format.
+ *
+ * @param stream	Output stream.
+ * @param dfa		DFA to be printed.
+ */
+void dfa_graphviz(FILE *stream, const struct dfa *dfa);
+
 #endif /** REFA_DFA_H @} */

tools/re2fa.c

@@ -38,6 +38,7 @@ static struct argp_option options[] = {
 	{"verbose",	'v',		0,	0, "Verbose output", 2},
 	{"join",	'j',		0,	0, "Join inputs into one output", 1},
 	{"minimize",	'm',		0,	0, "Minimize automaton", 1},
+	{"print-gv",	'g',		0,	0, "Print Graphviz representation of automaton", 2},
 	{0}
 };
 
@@ -52,6 +53,7 @@ struct arguments {
 	int	verbose;
 	int	join;
 	int	minimize;
+	int	gv;
 
 	int	thread_cnt;
 };
@@ -110,6 +112,9 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
 	case 'v':
 		args->verbose = 1;
 		break;
+	case 'g':
+		args->gv = 1;
+		break;
 	case ARGP_KEY_ARG:
 		args->input = realloc(args->input,
 				      sizeof(char *) * (args->input_cnt + 1));
@@ -142,6 +147,7 @@ int main(int argc, char **argv)
 	arguments.output_path	= NULL;
 	arguments.output_type	= FAT_DFA_FILE;
 	arguments.verbose	= 0;
+	arguments.gv		= 0;
 	arguments.join		= 0;
 	arguments.minimize	= 0;
 	arguments.thread_cnt	= 1;
@@ -227,9 +233,10 @@ int main(int argc, char **argv)
 				size_t	before = dfa[i].state_cnt;
 				dfa_minimize(&dfa[i]);
 				if (arguments.verbose) {
-					printf("dfa minimized %zu->%zu\n",
-					       before,
-					       dfa[i].state_cnt);
+					fprintf(stderr,
+						"dfa minimized %zu->%zu\n",
+						before,
+						dfa[i].state_cnt);
 				}
 			}
 
@@ -242,11 +249,19 @@ int main(int argc, char **argv)
 
 	if (arguments.verbose)
 		for (int j = 0; j < dfa_cnt; j++) {
-			printf("[dfa]\n"
-			       "  state cnt: %zu, bps: %d\n",
-				dfa[j].state_cnt, dfa[j].bps);
+			fprintf(stderr, "[dfa]\n"
+					"  state cnt: %zu\n",
+					dfa[j].state_cnt);
 		}
 
+	if (arguments.gv) {
+		if (dfa_cnt == 1) {
+			dfa_graphviz(stdout, &dfa[0]);
+		} else {
+			fprintf(stderr, "You can print only 1 DFA\n");
+		}
+	}
+
 	if (dfa_cnt > 1 && arguments.join) {
 		main_dfa_join(dfa, dfa_cnt, arguments.thread_cnt);