grep branch, master, updated. v2.25-29-g1f3d1c3

[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  1f3d1c3be3ff564a9d641c2ebd180124f455a697 (commit)
       via  26d1db317487a8cc279e872224e7876d112cdf50 (commit)
       via  08d06101acc3b2e2bbcfec8a5347229060489b95 (commit)
       via  6b4e05d3d53a9b842c43fccb3a0e1780a506fbcd (commit)
      from  440b0b85d13dab62a562762db51c6de2255fc9f1 (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=1f3d1c3be3ff564a9d641c2ebd180124f455a697


commit 1f3d1c3be3ff564a9d641c2ebd180124f455a697
Author: Paul Eggert <address@hidden>
Date:   Wed Jul 6 19:25:20 2016 +0200

    dfa: don't treat null bytes specially
    
    * src/dfa.c (transit_state): Do not treat null byte specially
    when eolbyte == '\n'.

diff --git a/src/dfa.c b/src/dfa.c
index d5ffe72..8f9f0bc 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2962,17 +2962,13 @@ transit_state (struct dfa *d, state_num s, unsigned 
char const **pp,
                unsigned char const *end)
 {
   state_num s1, s2;
-  int mbclen;  /* The length of current input multibyte character.  */
   wint_t wc;
-  int context;
   size_t i, j;
   int k;
   int separate_contexts;
 
-  /* Note: caller must free the return value of this function.  */
-  mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
-
-  context = (wc == (wchar_t) eolbyte || wc == 0) ? CTX_NEWLINE : CTX_NONE;
+  int mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
+  int context = wc == eolbyte ? CTX_NEWLINE : CTX_NONE;
 
   /* This state has some operators which can match a multibyte character.  */
   d->mb_follows.nelem = 0;
@@ -3000,10 +2996,9 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     }
 
   separate_contexts = state_separate_contexts (&d->mb_follows);
-  if (context == CTX_NEWLINE && separate_contexts & CTX_NEWLINE)
-    s1 = state_index (d, &d->mb_follows, CTX_NEWLINE);
-  else
-    s1 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY);
+  if (! (context == CTX_NEWLINE || separate_contexts & CTX_NEWLINE))
+    context = separate_contexts ^ CTX_ANY;
+  s1 = state_index (d, &d->mb_follows, context);
   realloc_trans_if_necessary (d, s1);
 
   return s1;

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


commit 1f3d1c3be3ff564a9d641c2ebd180124f455a697
Author: Paul Eggert <address@hidden>
Date:   Wed Jul 6 19:25:20 2016 +0200

    dfa: don't treat null bytes specially
    
    * src/dfa.c (transit_state): Do not treat null byte specially
    when eolbyte == '\n'.

diff --git a/src/dfa.c b/src/dfa.c
index d5ffe72..8f9f0bc 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2962,17 +2962,13 @@ transit_state (struct dfa *d, state_num s, unsigned 
char const **pp,
                unsigned char const *end)
 {
   state_num s1, s2;
-  int mbclen;  /* The length of current input multibyte character.  */
   wint_t wc;
-  int context;
   size_t i, j;
   int k;
   int separate_contexts;
 
-  /* Note: caller must free the return value of this function.  */
-  mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
-
-  context = (wc == (wchar_t) eolbyte || wc == 0) ? CTX_NEWLINE : CTX_NONE;
+  int mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
+  int context = wc == eolbyte ? CTX_NEWLINE : CTX_NONE;
 
   /* This state has some operators which can match a multibyte character.  */
   d->mb_follows.nelem = 0;
@@ -3000,10 +2996,9 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     }
 
   separate_contexts = state_separate_contexts (&d->mb_follows);
-  if (context == CTX_NEWLINE && separate_contexts & CTX_NEWLINE)
-    s1 = state_index (d, &d->mb_follows, CTX_NEWLINE);
-  else
-    s1 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY);
+  if (! (context == CTX_NEWLINE || separate_contexts & CTX_NEWLINE))
+    context = separate_contexts ^ CTX_ANY;
+  s1 = state_index (d, &d->mb_follows, context);
   realloc_trans_if_necessary (d, s1);
 
   return s1;

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


commit 1f3d1c3be3ff564a9d641c2ebd180124f455a697
Author: Paul Eggert <address@hidden>
Date:   Wed Jul 6 19:25:20 2016 +0200

    dfa: don't treat null bytes specially
    
    * src/dfa.c (transit_state): Do not treat null byte specially
    when eolbyte == '\n'.

diff --git a/src/dfa.c b/src/dfa.c
index d5ffe72..8f9f0bc 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2962,17 +2962,13 @@ transit_state (struct dfa *d, state_num s, unsigned 
char const **pp,
                unsigned char const *end)
 {
   state_num s1, s2;
-  int mbclen;  /* The length of current input multibyte character.  */
   wint_t wc;
-  int context;
   size_t i, j;
   int k;
   int separate_contexts;
 
-  /* Note: caller must free the return value of this function.  */
-  mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
-
-  context = (wc == (wchar_t) eolbyte || wc == 0) ? CTX_NEWLINE : CTX_NONE;
+  int mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
+  int context = wc == eolbyte ? CTX_NEWLINE : CTX_NONE;
 
   /* This state has some operators which can match a multibyte character.  */
   d->mb_follows.nelem = 0;
@@ -3000,10 +2996,9 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     }
 
   separate_contexts = state_separate_contexts (&d->mb_follows);
-  if (context == CTX_NEWLINE && separate_contexts & CTX_NEWLINE)
-    s1 = state_index (d, &d->mb_follows, CTX_NEWLINE);
-  else
-    s1 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY);
+  if (! (context == CTX_NEWLINE || separate_contexts & CTX_NEWLINE))
+    context = separate_contexts ^ CTX_ANY;
+  s1 = state_index (d, &d->mb_follows, context);
   realloc_trans_if_necessary (d, s1);
 
   return s1;

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


commit 1f3d1c3be3ff564a9d641c2ebd180124f455a697
Author: Paul Eggert <address@hidden>
Date:   Wed Jul 6 19:25:20 2016 +0200

    dfa: don't treat null bytes specially
    
    * src/dfa.c (transit_state): Do not treat null byte specially
    when eolbyte == '\n'.

diff --git a/src/dfa.c b/src/dfa.c
index d5ffe72..8f9f0bc 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2962,17 +2962,13 @@ transit_state (struct dfa *d, state_num s, unsigned 
char const **pp,
                unsigned char const *end)
 {
   state_num s1, s2;
-  int mbclen;  /* The length of current input multibyte character.  */
   wint_t wc;
-  int context;
   size_t i, j;
   int k;
   int separate_contexts;
 
-  /* Note: caller must free the return value of this function.  */
-  mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
-
-  context = (wc == (wchar_t) eolbyte || wc == 0) ? CTX_NEWLINE : CTX_NONE;
+  int mbclen = mbs_to_wchar (&wc, (char const *) *pp, end - *pp, d);
+  int context = wc == eolbyte ? CTX_NEWLINE : CTX_NONE;
 
   /* This state has some operators which can match a multibyte character.  */
   d->mb_follows.nelem = 0;
@@ -3000,10 +2996,9 @@ transit_state (struct dfa *d, state_num s, unsigned char 
const **pp,
     }
 
   separate_contexts = state_separate_contexts (&d->mb_follows);
-  if (context == CTX_NEWLINE && separate_contexts & CTX_NEWLINE)
-    s1 = state_index (d, &d->mb_follows, CTX_NEWLINE);
-  else
-    s1 = state_index (d, &d->mb_follows, separate_contexts ^ CTX_ANY);
+  if (! (context == CTX_NEWLINE || separate_contexts & CTX_NEWLINE))
+    context = separate_contexts ^ CTX_ANY;
+  s1 = state_index (d, &d->mb_follows, context);
   realloc_trans_if_necessary (d, s1);
 
   return s1;

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

Summary of changes:
 src/dfa.c |  355 ++++++++++++++++---------------------------------------------
 1 file changed, 90 insertions(+), 265 deletions(-)


hooks/post-receive
-- 
grep