[gawk-diffs] [SCM] gawk branch, gawk-4.1-stable, updated. gawk-4.1.0-762-g4423a72

[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.1-stable has been updated
       via  4423a72864dbeecf6251ce5543404f7baa20bf82 (commit)
       via  f637abf1afe96ea36717ee4365b9405b0c7c1b17 (commit)
      from  611dc46d8b216c22f05604e8df6bee7aa59e5977 (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=4423a72864dbeecf6251ce5543404f7baa20bf82

commit 4423a72864dbeecf6251ce5543404f7baa20bf82
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Oct 16 08:20:54 2015 +0300

    Sync dfa.c with GNU grep.

diff --git a/ChangeLog b/ChangeLog
index 03222e4..d215340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
        Thanks to Michal Jaegermann <address@hidden>
        for the report.
 
+       Unrelated:
+
+       * dfa.c: Sync with GNU grep.
+
 2015-10-11         Arnold D. Robbins     <address@hidden>
 
        * awkgram.y (yylex): Fix invalid read problems.
diff --git a/dfa.c b/dfa.c
index 8c24534..188a2d5 100644
--- a/dfa.c
+++ b/dfa.c
@@ -3982,6 +3982,9 @@ dfamust (struct dfa const *d)
   bool begline = false;
   bool endline = false;
   size_t rj;
+  bool need_begline = false;
+  bool need_endline = false;
+  bool case_fold_unibyte = case_fold && MB_CUR_MAX == 1;
   struct dfamust *dm;
 
   for (ri = 0; ri < d->tindex; ++ri)
@@ -3992,10 +3995,12 @@ dfamust (struct dfa const *d)
         case BEGLINE:
           mp = allocmust (mp, 2);
           mp->begline = true;
+          need_begline = true;
           break;
         case ENDLINE:
           mp = allocmust (mp, 2);
           mp->endline = true;
+          need_endline = true;
           break;
         case LPAREN:
         case RPAREN:
@@ -4072,7 +4077,9 @@ dfamust (struct dfa const *d)
               result = mp->in[i];
           if (STREQ (result, mp->is))
             {
-              exact = true;
+              if ((!need_begline || mp->begline) && (!need_endline
+                                                     || mp->endline))
+                exact = true;
               begline = mp->begline;
               endline = mp->endline;
             }
@@ -4145,7 +4152,7 @@ dfamust (struct dfa const *d)
               t = j;
               while (++j < NOTCHAR)
                 if (tstbit (j, *ccl)
-                    && ! (case_fold && MB_CUR_MAX == 1
+                    && ! (case_fold_unibyte
                           && toupper (j) == toupper (t)))
                   break;
               if (j < NOTCHAR)
@@ -4168,17 +4175,17 @@ dfamust (struct dfa const *d)
             }
           mp = allocmust (mp, ((rj - ri) >> 1) + 1);
           mp->is[0] = mp->left[0] = mp->right[0]
-            = case_fold && MB_CUR_MAX == 1 ? toupper (t) : t;
+            = case_fold_unibyte ? toupper (t) : t;
 
           for (i = 1; ri + 2 < rj; i++)
             {
               ri += 2;
               t = d->tokens[ri];
               mp->is[i] = mp->left[i] = mp->right[i]
-                = case_fold && MB_CUR_MAX == 1 ? toupper (t) : t;
+                = case_fold_unibyte ? toupper (t) : t;
             }
           mp->is[i] = mp->left[i] = mp->right[i] = '\0';
-          mp->in = enlist (mp->in, mp->is, i - 1);
+          mp->in = enlist (mp->in, mp->is, i);
           break;
         }
     }

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=f637abf1afe96ea36717ee4365b9405b0c7c1b17

commit f637abf1afe96ea36717ee4365b9405b0c7c1b17
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Oct 16 08:19:47 2015 +0300

    Fix build ordering issues.

diff --git a/ChangeLog b/ChangeLog
index 4eea7fd..03222e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-16         Arnold D. Robbins     <address@hidden>
+
+       * Makefile.am (SUBDIRS): Fix ordering so that
+       make check directly after configure works properly.
+       Thanks to Michal Jaegermann <address@hidden>
+       for the report.
+
 2015-10-11         Arnold D. Robbins     <address@hidden>
 
        * awkgram.y (yylex): Fix invalid read problems.
diff --git a/Makefile.am b/Makefile.am
index 342df29..460f911 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,21 +59,24 @@ EXTRA_DIST = \
        ylwrap
 
 # The order to do things in.
+#
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
+#
+# Build in extension before test so that
+#      ./configure && make check
+# works properly too.
+#
 # Build in awklib after in doc, since we want to extract
 # sample files if doc/gawk.texi changed.
-SUBDIRS = \
-       . \
-       doc \
-       awklib \
-       po \
-       test
+SUBDIRS = .
 
 if ENABLE_EXTENSIONS
 SUBDIRS += extension
 endif
 
+SUBDIRS += doc awklib po test
+
 # what to make and install
 bin_PROGRAMS = gawk
 include_HEADERS = gawkapi.h
diff --git a/Makefile.in b/Makefile.in
index 08f434c..1fb71a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -262,7 +262,7 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = . doc awklib po test extension
+DIST_SUBDIRS = . extension doc awklib po test
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/configh.in ABOUT-NLS \
        AUTHORS COPYING ChangeLog INSTALL NEWS README awkgram.c \
        command.c compile config.guess config.rpath config.sub depcomp \
@@ -477,11 +477,17 @@ EXTRA_DIST = \
 
 
 # The order to do things in.
+#
 # Build explicitly in "." in order to build gawk first, so
 # that `make check' without a prior `make' works.
+#
+# Build in extension before test so that
+#      ./configure && make check
+# works properly too.
+#
 # Build in awklib after in doc, since we want to extract
 # sample files if doc/gawk.texi changed.
-SUBDIRS = . doc awklib po test $(am__append_1)
+SUBDIRS = . $(am__append_1) doc awklib po test
 include_HEADERS = gawkapi.h
 
 # sources for both gawk and dgawk

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

Summary of changes:
 ChangeLog   |   11 +++++++++++
 Makefile.am |   15 +++++++++------
 Makefile.in |   10 ++++++++--
 dfa.c       |   17 ++++++++++++-----
 4 files changed, 40 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
gawk