commit ad0209f094996d7d6bd1ce2319f5b0385f343bd6 from: Sven M. Hallberg date: Thu Nov 03 21:31:58 2022 UTC forgot the actual implementation m) commit - 1136713e1fd6fc30885737d3864db2108b0710f3 commit + ad0209f094996d7d6bd1ce2319f5b0385f343bd6 blob - 88bc021b0c450da7455ca57d7946c90088dfc125 blob + 7d338fb279442bce81d01c14b97d97734f3c1e4d --- nfa.c +++ nfa.c @@ -538,7 +538,7 @@ nfaprep(NFA a) } void -nfainit(struct prep *pr, sub_t *sub, out_t *out, void *env) +nfastart(struct prep *pr, sub_t *sub, out_t *out, void *env) { assert(pr != NULL); @@ -803,10 +803,10 @@ nfaend(struct prep *pr) } int -nfarunp(struct prep *pr, +nfarun_(struct prep *pr, sub_t *sub, out_t *out, void *env, const char *inp, size_t sz) { - nfainit(pr, sub, out, env); + nfastart(pr, sub, out, env); nfacont(pr, inp, sz); nfaend(pr); return pr->match; @@ -819,16 +819,16 @@ nfarun(NFA a, sub_t *sub, out_t *out, void *env, const int result; pr = nfaprep(a); - result = nfarunp(pr, sub, out, env, inp, sz); + result = nfarun_(pr, sub, out, env, inp, sz); free(pr); return result; } int -nfamatchp(struct prep *pr, const char *inp, size_t sz) +nfamatch_(struct prep *pr, const char *inp, size_t sz) { - return nfarunp(pr, NULL, NULL, NULL, inp, sz); + return nfarun_(pr, NULL, NULL, NULL, inp, sz); } int blob - 17531c235789f3bd6d3c6552850f3bb148d954c0 blob + 3c9f25e25a5d2d69abc7c2236800e2743a84f315 --- simcard.c +++ simcard.c @@ -276,7 +276,7 @@ main(int argc, char *argv[]) assert(feof(stdin)); // XXX env.input = buf; - m = nfarunp(pr, sub, out, &env, buf, n); + m = nfarun_(pr, sub, out, &env, buf, n); if (m == -1) { fprintf(stderr, "Protocol error.\n"); return 1; blob - 8ad2754311ad3a9f71549f4965915e40c16093e1 blob + 1dbfb95117cc7569a2e20b1d9024a82367ced941 --- test_nfa.c +++ test_nfa.c @@ -128,7 +128,7 @@ benchmark(NFA a) /* warmup */ sz = strlen(inputs[0]); for (i = 0; i < N; i++) - nfarunp(pr, sub, out_bench, &env, inputs[0], sz); + nfarun_(pr, sub, out_bench, &env, inputs[0], sz); for (p = inputs; *p != NULL; p++) { printf("%30.30s ", *p); @@ -138,7 +138,7 @@ benchmark(NFA a) env.input = *p; clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t0); for (i = 0; i < N; i++) - n = nfarunp(pr, sub, out_bench, &env, *p, sz); + n = nfarun_(pr, sub, out_bench, &env, *p, sz); clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t); timespecsub(&t, &t0, &td);