summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2016-12-11 18:19:32 (GMT)
committerArnold D. Robbins <arnold@skeeve.com>2016-12-11 18:19:32 (GMT)
commit1bacda9f09bbb55c0ea3de42114c2dfe6cceec09 (patch)
tree93e5da1c241c391d0e09bab340288be2d3f83b24
parentf2b6d100d8958a9c811c950f113a0ce38a25d484 (diff)
parent7a7d021de54fbb1561367b1155bc1320a21d003d (diff)
downloadgawk-1bacda9f09bbb55c0ea3de42114c2dfe6cceec09.zip
gawk-1bacda9f09bbb55c0ea3de42114c2dfe6cceec09.tar.gz
gawk-1bacda9f09bbb55c0ea3de42114c2dfe6cceec09.tar.bz2
Merge branch 'master' into feature/api-min-max
-rw-r--r--ChangeLog4
-rw-r--r--dfa.c46
2 files changed, 24 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index df8f919..a2dbc0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-11 Arnold D. Robbins <arnold@skeeve.com>
+
+ * dfa.c: Sync with GNULIB.
+
2016-12-06 Arnold D. Robbins <arnold@skeeve.com>
Add minimum required and maximum expected number of arguments
diff --git a/dfa.c b/dfa.c
index ae64ba9..10a8358 100644
--- a/dfa.c
+++ b/dfa.c
@@ -2850,39 +2850,33 @@ realloc_trans_if_necessary (struct dfa *d, state_num new_state)
static state_num
build_state (state_num s, struct dfa *d, unsigned char uc)
{
- state_num *trans; /* The new transition table. */
- state_num i, maxstate;
+ /* A pointer to the new transition table, and the table itself. */
+ state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s;
+ state_num *trans = *ptrans;
- if (d->fails[s] != NULL)
- trans = d->fails[s];
- else
+ if (!trans)
{
- state_num **ptrans = (ACCEPTING (s, *d) ? d->fails : d->trans) + s;
- if (!*ptrans)
+ /* MAX_TRCOUNT is an arbitrary upper limit on the number of
+ transition tables that can exist at once, other than for
+ initial states. Often-used transition tables are quickly
+ rebuilt, whereas rarely-used ones are cleared away. */
+ if (MAX_TRCOUNT <= d->trcount)
{
- /* MAX_TRCOUNT is an arbitrary upper limit on the number of
- transition tables that can exist at once, other than for
- initial states. Often-used transition tables are quickly
- rebuilt, whereas rarely-used ones are cleared away. */
- if (MAX_TRCOUNT <= d->trcount)
+ for (state_num i = d->min_trcount; i < d->tralloc; i++)
{
- for (i = d->min_trcount; i < d->tralloc; i++)
- {
- free (d->trans[i]);
- free (d->fails[i]);
- d->trans[i] = d->fails[i] = NULL;
- }
- d->trcount = 0;
+ free (d->trans[i]);
+ free (d->fails[i]);
+ d->trans[i] = d->fails[i] = NULL;
}
-
- d->trcount++;
- *ptrans = xmalloc (NOTCHAR * sizeof *trans);
+ d->trcount = 0;
}
- trans = *ptrans;
+
+ d->trcount++;
+ *ptrans = trans = xmalloc (NOTCHAR * sizeof *trans);
/* Fill transition table with a default value which means that the
transited state has not been calculated yet. */
- for (i = 0; i < NOTCHAR; i++)
+ for (int i = 0; i < NOTCHAR; i++)
trans[i] = -2;
}
@@ -2900,8 +2894,8 @@ build_state (state_num s, struct dfa *d, unsigned char uc)
/* Now go through the new transition table, and make sure that the trans
and fail arrays are allocated large enough to hold a pointer for the
largest state mentioned in the table. */
- maxstate = -1;
- for (i = 0; i < NOTCHAR; ++i)
+ state_num maxstate = -1;
+ for (int i = 0; i < NOTCHAR; i++)
if (maxstate < trans[i])
maxstate = trans[i];
realloc_trans_if_necessary (d, maxstate);