grep branch, master, updated. v2.21-70-g8c0b2f3

[Paul Eggert]

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 "grep".

The branch, master has been updated
       via  8c0b2f39b3b194eadb82210d7e2e1abf2da2a929 (commit)
       via  508dd6eb0b9a27db1106046169dc77e67e2d0720 (commit)
       via  d3a41769611484cd182714cbd840ca36c9d92204 (commit)
      from  93a6d6d7bd1d688f2c0d8bdebfb64536ee827387 (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.savannah.gnu.org/cgit/grep.git/commit/?id=8c0b2f39b3b194eadb82210d7e2e1abf2da2a929


commit 8c0b2f39b3b194eadb82210d7e2e1abf2da2a929
Author: Paul Eggert <address@hidden>
Date:   Tue Oct 13 15:26:38 2015 -0700

    dfa: make the executable a bit smaller
    
    * src/dfa.c (dfamust): Hoist MB_CUR_MAX calculation out of loops.

diff --git a/src/dfa.c b/src/dfa.c
index cdea4e5..c1a00f8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3942,6 +3942,7 @@ dfamust (struct dfa const *d)
   bool endline = false;
   bool need_begline = false;
   bool need_endline = false;
+  bool case_fold_unibyte = case_fold && MB_CUR_MAX == 1;
 
   for (size_t ri = 0; ri < d->tindex; ++ri)
     {
@@ -4108,7 +4109,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)
@@ -4131,14 +4132,14 @@ 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);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=508dd6eb0b9a27db1106046169dc77e67e2d0720


commit 8c0b2f39b3b194eadb82210d7e2e1abf2da2a929
Author: Paul Eggert <address@hidden>
Date:   Tue Oct 13 15:26:38 2015 -0700

    dfa: make the executable a bit smaller
    
    * src/dfa.c (dfamust): Hoist MB_CUR_MAX calculation out of loops.

diff --git a/src/dfa.c b/src/dfa.c
index cdea4e5..c1a00f8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3942,6 +3942,7 @@ dfamust (struct dfa const *d)
   bool endline = false;
   bool need_begline = false;
   bool need_endline = false;
+  bool case_fold_unibyte = case_fold && MB_CUR_MAX == 1;
 
   for (size_t ri = 0; ri < d->tindex; ++ri)
     {
@@ -4108,7 +4109,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)
@@ -4131,14 +4132,14 @@ 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);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d3a41769611484cd182714cbd840ca36c9d92204


commit 8c0b2f39b3b194eadb82210d7e2e1abf2da2a929
Author: Paul Eggert <address@hidden>
Date:   Tue Oct 13 15:26:38 2015 -0700

    dfa: make the executable a bit smaller
    
    * src/dfa.c (dfamust): Hoist MB_CUR_MAX calculation out of loops.

diff --git a/src/dfa.c b/src/dfa.c
index cdea4e5..c1a00f8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3942,6 +3942,7 @@ dfamust (struct dfa const *d)
   bool endline = false;
   bool need_begline = false;
   bool need_endline = false;
+  bool case_fold_unibyte = case_fold && MB_CUR_MAX == 1;
 
   for (size_t ri = 0; ri < d->tindex; ++ri)
     {
@@ -4108,7 +4109,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)
@@ -4131,14 +4132,14 @@ 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);

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

Summary of changes:
 src/dfa.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
grep