commit b5d4d6b940bf51a86048964de429c6588e02064e from: Sven M. Hallberg date: Mon Nov 07 01:27:59 2022 UTC style (assert) commit - 60c14e7b4692bb5bf1a66a54bc2477ddcd252505 commit + b5d4d6b940bf51a86048964de429c6588e02064e blob - 9ff79bdb0eed61627e7cb786f4bfd0b84cfeab83 blob + 0a440a86ae09c5578612dd8595c9748bd40a2e9e --- nfa.c +++ nfa.c @@ -22,8 +22,8 @@ nfa_alloc(int sz) { struct state *st; - assert (sz >= 0); - assert (sz <= SIZE_MAX / sizeof(struct state)); + assert(sz >= 0); + assert(sz <= SIZE_MAX / sizeof(struct state)); st = malloc(sz * sizeof(struct state)); if (sz > 0 && st == NULL) err(100, "nfa_alloc"); @@ -64,14 +64,14 @@ range_(int x, int y) /* [x, y) */ NFA range(unsigned char min, unsigned char max) { - assert (min <= max); + assert(min <= max); return range_(min, max + 1); } NFA nrange(unsigned char min, unsigned char max) { - assert (min <= max); + assert(min <= max); return range_(max + 1, min); /* negative range */ } @@ -91,16 +91,16 @@ any(void) NFA symbol(int x) /* input only */ { - assert (x >= 0); - assert (x < OUTPUT); + assert(x >= 0); + assert(x < OUTPUT); return range_(x, x + 1); } NFA output(int x) { - assert (x >= OUTPUT); - assert (x < INT_MAX); + assert(x >= OUTPUT); + assert(x < INT_MAX); return range_(x, x + 1); } @@ -141,8 +141,8 @@ think(int x) * should be active. this way these edges are easily handled by the * iteration in epsilon_closure() below. */ - assert (x >= INNER); - assert (x < 0); + assert(x >= INNER); + assert(x < 0); return range_(x, x); } @@ -269,7 +269,7 @@ choice_(NFA a, ...) *p = a.state[j]; /* adjust final edges to the new end */ - assert (p - sq.state < sz); + assert(p - sq.state < sz); if (j + p->edge_chr == a.size) p->edge_chr = sz - (p - sq.state); if (j + p->edge_eps == a.size) @@ -306,8 +306,8 @@ rep(int n, NFA a) return epsilon(); /* allocate result */ - assert (n > 0); - assert (a.size >= 0); + assert(n > 0); + assert(a.size >= 0); if (a.size > INT_MAX / n) errx(1, "rep: would exceed INT_MAX"); r = nfa_alloc(n * a.size); @@ -328,7 +328,7 @@ plus(NFA a) NFA r; /* allocate result */ - assert (a.size >= 0); + assert(a.size >= 0); if (a.size > INT_MAX - 1) errx(1, "plus: would exceed INT_MAX"); r = nfa_alloc(a.size + 1); @@ -511,10 +511,10 @@ nfaprep(NFA a) int setsz; /* allocate */ - assert (a.size <= SIZE_MAX - sizeof(bunch_t)); // XXX ? + assert(a.size <= SIZE_MAX - sizeof(bunch_t)); // XXX ? setsz = (a.size + BUNCH_BIT) / BUNCH_BIT; /* a.size + 1 bits */ pr = malloc(sizeof(struct prep) + 3 * setsz * sizeof(bunch_t)); - assert (pr != NULL); // XXX + assert(pr != NULL); // XXX pr->act.n = pr->next.n = pr->a.size + 1; pr->act.sz = pr->next.sz = setsz;