diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-12-15 22:11:40 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-12-15 22:11:40 +0200 |
| commit | 92d7c72c7e36c10f1274c79ed539490e6724feea (patch) | |
| tree | 5422d54d44ee1361e1c14264270610f971999028 | |
| parent | 87be181b99d7aae73e52b3b791597194c1e065c8 (diff) | |
| parent | db47960210d3c56465b3658152f6c7981f6b5f82 (diff) | |
| download | egawk-92d7c72c7e36c10f1274c79ed539490e6724feea.tar.gz egawk-92d7c72c7e36c10f1274c79ed539490e6724feea.tar.bz2 egawk-92d7c72c7e36c10f1274c79ed539490e6724feea.zip | |
Merge branch 'gawk-4.2-stable'
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/dfa.c | 16 | ||||
| -rw-r--r-- | support/dfa.h | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 7669daf9..e7158541 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2018-12-15 Arnold D. Robbins <arnold@skeeve.com> + + * dfa.h, dfa.c: Sync with GNULIB. + 2018-10-31 Arnold D. Robbins <arnold@skeeve.com> * dfa.c (charclass_context): Remove unused function. diff --git a/support/dfa.c b/support/dfa.c index 0f0a661e..612faa10 100644 --- a/support/dfa.c +++ b/support/dfa.c @@ -2687,11 +2687,11 @@ dfaanalyze (struct dfa *d, bool searchflag) { tmp.elems = firstpos - stk[-1].nfirstpos; tmp.nelem = stk[-1].nfirstpos; - position *pos = lastpos - stk[-1].nlastpos; + position *p = lastpos - stk[-1].nlastpos; for (size_t j = 0; j < stk[-1].nlastpos; j++) { - merge (&tmp, &d->follows[pos[j].index], &merged); - copy (&merged, &d->follows[pos[j].index]); + merge (&tmp, &d->follows[p[j].index], &merged); + copy (&merged, &d->follows[p[j].index]); } } FALLTHROUGH; @@ -2707,11 +2707,11 @@ dfaanalyze (struct dfa *d, bool searchflag) { tmp.nelem = stk[-1].nfirstpos; tmp.elems = firstpos - stk[-1].nfirstpos; - position *pos = lastpos - stk[-1].nlastpos - stk[-2].nlastpos; + position *p = lastpos - stk[-1].nlastpos - stk[-2].nlastpos; for (size_t j = 0; j < stk[-2].nlastpos; j++) { - merge (&tmp, &d->follows[pos[j].index], &merged); - copy (&merged, &d->follows[pos[j].index]); + merge (&tmp, &d->follows[p[j].index], &merged); + copy (&merged, &d->follows[p[j].index]); } } @@ -2728,9 +2728,9 @@ dfaanalyze (struct dfa *d, bool searchflag) stk[-2].nlastpos += stk[-1].nlastpos; else { - position *pos = lastpos - stk[-1].nlastpos - stk[-2].nlastpos; + position *p = lastpos - stk[-1].nlastpos - stk[-2].nlastpos; for (size_t j = 0; j < stk[-1].nlastpos; j++) - pos[j] = pos[j + stk[-2].nlastpos]; + p[j] = p[j + stk[-2].nlastpos]; lastpos -= stk[-2].nlastpos; stk[-2].nlastpos = stk[-1].nlastpos; } diff --git a/support/dfa.h b/support/dfa.h index 79ada1e2..e419e9a0 100644 --- a/support/dfa.h +++ b/support/dfa.h @@ -1,5 +1,5 @@ /* dfa.h - declarations for GNU deterministic regexp compiler - Copyright (C) 1988, 1998, 2007, 2009-2017 Free Software Foundation, Inc. + Copyright (C) 1988, 1998, 2007, 2009-2018 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |