Merge pull request #509 from katef/sv/fix-lx-token-identification

Fix lx token identification

Author: katef

Makefile

@@ -124,8 +124,7 @@ SUBDIR += tests/fsm
 SUBDIR += tests/glob
 SUBDIR += tests/like
 SUBDIR += tests/literal
-# FIXME: commenting this out for now due to Makefile error
-#SUBDIR += tests/lxpos
+SUBDIR += tests/lxpos
 SUBDIR += tests/minimise
 SUBDIR += tests/native
 SUBDIR += tests/pcre
@@ -190,6 +189,6 @@ STAGE_BUILD := ${STAGE_BUILD:Nbin/cvtpcre}
 
 .if make(test)
 .END::
-	grep FAIL ${BUILD}/tests/*/res*; [ $$? -ne 0 ]
+	grep FAIL ${BUILD}/tests/*/*res*; [ $$? -ne 0 ]
 .endif
 

include/fsm/print.h

@@ -75,8 +75,15 @@ struct fsm_hooks {
 		void *lang_opaque, void *hook_opaque);
 
 	int (*reject)(FILE *, const struct fsm_options *opt,
+		const struct fsm_state_metadata *state_metadata,
 		void *lang_opaque, void *hook_opaque);
 
+	/* If non-NULL, this will be called to generate code
+	 * in scope immediately after advancing to the
+	 * next character of input. */
+	int (*advance)(FILE *, const struct fsm_options *opt,
+		const char *cur_char_var, void *hook_opaque);
+
 	int (*comment)(FILE *, const struct fsm_options *opt,
 		const struct fsm_state_metadata *state_metadata,
 		void *hook_opaque);

src/libfsm/print.c

@@ -111,6 +111,7 @@ int
 print_hook_reject(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct fsm_state_metadata *state_metadata,
 	int (*default_reject)(FILE *f, const struct fsm_options *opt,
 		void *lang_opaque, void *hook_opaque),
 	void *lang_opaque)
@@ -124,7 +125,7 @@ print_hook_reject(FILE *f,
 	}
 
 	if (hooks->reject != NULL) {
-		return hooks->reject(f, opt,
+		return hooks->reject(f, opt, state_metadata,
 			lang_opaque, hooks->hook_opaque);
 	} else if (default_reject != NULL) {
 		return default_reject(f, opt,

src/libfsm/print.h

@@ -44,6 +44,7 @@ int
 print_hook_reject(FILE *f,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
+	const struct fsm_state_metadata *state_metadata,
 	int (*default_reject)(FILE *f, const struct fsm_options *opt,
 		void *lang_opaque, void *hook_opaque),
 	void *lang_opaque);

src/libfsm/print/awk.c

@@ -154,7 +154,7 @@ print_end(FILE *f, const struct dfavm_op_ir *op,
 {
 	switch (end_bits) {
 	case VM_END_FAIL:
-		return print_hook_reject(f, opt, hooks, default_reject, NULL);
+		return print_hook_reject(f, opt, hooks, NULL, default_reject, NULL);
 
 	case VM_END_SUCC:;
 		struct fsm_state_metadata state_metadata = {

src/libfsm/print/c.c

@@ -210,7 +210,7 @@ print_groups(FILE *f, const struct fsm_options *opt,
 }
 
 static int
-print_case(FILE *f, const struct ir *ir,
+print_case(FILE *f, const struct ir *ir, fsm_state_t state_id,
 	const struct fsm_options *opt,
 	const struct fsm_hooks *hooks,
 	const char *cp,
@@ -222,10 +222,16 @@ print_case(FILE *f, const struct ir *ir,
 	assert(f != NULL);
 	assert(cs != NULL);
 
+	assert(state_id < ir->n);
+	const struct fsm_state_metadata state_metadata = {
+		.end_ids = ir->states[state_id].endids.ids,
+		.end_id_count = ir->states[state_id].endids.count,
+	};
+
 	switch (cs->strategy) {
 	case IR_NONE:
 		fprintf(f, "\t\t\t");
-		if (-1 == print_hook_reject(f, opt, hooks, default_reject, NULL)) {
+		if (-1 == print_hook_reject(f, opt, hooks, &state_metadata, default_reject, NULL)) {
 			return -1;
 		}
 		fprintf(f, "\n");
@@ -254,7 +260,7 @@ print_case(FILE *f, const struct ir *ir,
 		print_groups(f, opt, ir_indexof(ir, cs), cs->u.partial.groups, cs->u.partial.n);
 
 		fprintf(f, "\t\t\tdefault:  ");
-		if (-1 == print_hook_reject(f, opt, hooks, default_reject, NULL)) {
+		if (-1 == print_hook_reject(f, opt, hooks, &state_metadata, default_reject, NULL)) {
 			return -1;
 		}
 		fprintf(f, "\n");
@@ -285,7 +291,7 @@ print_case(FILE *f, const struct ir *ir,
 
 		print_ranges(f, opt, cs->u.error.error.ranges, cs->u.error.error.n);
 		fprintf(f, " ");
-		if (-1 == print_hook_reject(f, opt, hooks, default_reject, NULL)) {
+		if (-1 == print_hook_reject(f, opt, hooks, &state_metadata, default_reject, NULL)) {
 			return -1;
 		}
 		fprintf(f, "\n");
@@ -398,7 +404,7 @@ print_endstates(FILE *f,
 
 	/* unexpected EOT */
 	fprintf(f, "\tdefault: ");
-	if (-1 == print_hook_reject(f, opt, hooks, default_reject, NULL)) {
+	if (-1 == print_hook_reject(f, opt, hooks, NULL, default_reject, NULL)) {
 		return -1;
 	}
 	fprintf(f, "\n");
@@ -435,7 +441,7 @@ fsm_print_cfrag(FILE *f, const struct ir *ir,
 		}
 		fprintf(f, "\n");
 
-		if (-1 == print_case(f, ir, opt, hooks, cp, &ir->states[i])) {
+		if (-1 == print_case(f, ir, i, opt, hooks, cp, &ir->states[i])) {
 			return -1;
 		}
 
@@ -500,6 +506,12 @@ fsm_print_c_body(FILE *f, const struct ir *ir,
 		break;
 	}
 
+	if (hooks->advance != NULL) {
+		if (-1 == hooks->advance(f, opt, cp, hooks->hook_opaque)) {
+			return -1;
+		}
+	}
+
 	if (-1 == fsm_print_cfrag(f, ir, opt, hooks, cp)) {
 		return -1;
 	}

src/libfsm/print/dot.c

@@ -226,7 +226,7 @@ print_dotfrag(FILE *f,
 			if (!opt->anonymous_states) {
 				fprintf(f, "\t%sS%-2u [ ", prefix, s);
 
-				if (-1 == print_hook_reject(f, opt, hooks, default_reject, &s)) {
+				if (-1 == print_hook_reject(f, opt, hooks, NULL, default_reject, &s)) {
 					return -1;
 				}
 

src/libfsm/print/fsm.c

@@ -184,7 +184,7 @@ print_state(FILE *f, const struct fsm_options *opt, const struct fsm_hooks *hook
 	assert(opt != NULL);
 
 	if (!fsm_isend(fsm, s)) {
-		if (-1 == print_hook_reject(f, opt, hooks, NULL, NULL)) {
+		if (-1 == print_hook_reject(f, opt, hooks, NULL, NULL, NULL)) {
 			return -1;
 		}
 	}

src/libfsm/print/go.c

@@ -185,7 +185,7 @@ print_end(FILE *f, const struct dfavm_op_ir *op,
 
 	switch (end_bits) {
 	case VM_END_FAIL:
-		return print_hook_reject(f, opt, hooks, default_reject, NULL);
+		return print_hook_reject(f, opt, hooks, NULL, default_reject, NULL);
 
 	case VM_END_SUCC:
 		assert(op->ret >= retlist->a);

src/libfsm/print/ir.h

@@ -91,11 +91,7 @@ struct ir_state {
 		} error;
 
 		struct {
-			/* Note: This is allocated separately, to avoid
-			 * making the union significantly larger. */
-			struct ir_state_table {
-				unsigned to[FSM_SIGMA_COUNT];
-			} *table;
+			int not_yet_implemented;
 		} table;
 	} u;
 };