[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-3089-gdb47960

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.2-stable has been updated
       via  db47960210d3c56465b3658152f6c7981f6b5f82 (commit)
      from  e452576cdd65472290db15c8a51cb70465a99a55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=db47960210d3c56465b3658152f6c7981f6b5f82

commit db47960210d3c56465b3658152f6c7981f6b5f82
Author: Arnold D. Robbins <address@hidden>
Date:   Sat Dec 15 22:11:02 2018 +0200

    Update dfa.h and dfa.c from GNULIB.

diff --git a/support/ChangeLog b/support/ChangeLog
index 927cd01..44f4a62 100644
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-15         Arnold D. Robbins     <address@hidden>
+
+       * dfa.h, dfa.c: Sync with GNULIB.
+
 2018-10-31         Arnold D. Robbins     <address@hidden>
 
        * dfa.c (charclass_context): Remove unused function.
diff --git a/support/dfa.c b/support/dfa.c
index 0f0a661..612faa1 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 7d11f05..86902eb 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

-----------------------------------------------------------------------

Summary of changes:
 support/ChangeLog |  4 ++++
 support/dfa.c     | 16 ++++++++--------
 support/dfa.h     |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
gawk