[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2596-g44cce02

[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, master has been updated
       via  44cce0245a8113885ecedc34ac955aca6a021ca9 (commit)
       via  11d4ea518166ffbc0c2fe85d090723e8f299486c (commit)
      from  9e419cfbc401e9b9fd45c8e854fdf5ae799261d5 (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=44cce0245a8113885ecedc34ac955aca6a021ca9

commit 44cce0245a8113885ecedc34ac955aca6a021ca9
Merge: 9e419cf 11d4ea5
Author: Arnold D. Robbins <address@hidden>
Date:   Sat Jul 15 22:31:18 2017 +0300

    Merge branch 'gawk-4.1-stable'

diff --cc ChangeLog
index 494964b,8c8d91d..ede4864
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
+ 2017-07-15         Arnold D. Robbins     <address@hidden>
+ 
+       Revert change of 2016-07-24 that always runs the dfa
+       matcher. Based on a bug report from Alexandre Oliva
+       <address@hidden>, DFA can cause gawk to hang, even
+       in the C locale.
+ 
+       * re.c (research): Don't use dfa if need_start is true.
+ 
 +2017-07-11         Arnold D. Robbins     <address@hidden>
 +
 +      * awk.h (is_letter): Add declaration.
 +      * ext.c (is_valid_identifier): New function.
 +      (make_builtin): Use is_valid_identifier instead of inline code.
 +      (is_letter): Moved from here ...
 +      * awkgram.y (is_letter): ... to here.
 +      (yylex): Use is_letter instead of a test.
 +      * command.y (yylex): Ditto.
 +      * main.c (arg_assign): Ditto.
 +
  2017-07-07         Arnold D. Robbins     <address@hidden>
  
        Remove warnings from GCC 7.1 compilation.
diff --cc re.c
index cf369a9,d1b0ee7..c522aeb
--- a/re.c
+++ b/re.c
@@@ -277,9 -285,17 +285,10 @@@ research(Regexp *rp, char *str, int sta
         * 7/2016: The dfa matcher can't handle a case where searching
         * starts in the middle of a string, so don't bother trying it
         * in that case.
+        *      if (rp->dfa && ! no_bol && start == 0) ...
         */
-       if (rp->dfareg != NULL && ! no_bol && start == 0) {
 -      if (rp->dfa && ! no_bol && ! need_start) {
 -              char save;
 -              size_t count = 0;
++      if (rp->dfareg != NULL && ! no_bol && ! need_start) {
                struct dfa *superset = dfasuperset(rp->dfareg);
 -              /*
 -               * dfa likes to stick a '\n' right after the matched
 -               * text.  So we just save and restore the character.
 -               */
 -              save = str[start+len];
                if (superset)
                        ret = dfaexec(superset, str+start, str+start+len,
                                                        true, NULL, NULL);

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

Summary of changes:
 ChangeLog |  9 +++++++++
 re.c      | 15 ++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
gawk