grep branch, master, updated. v2.10-78-g9894f82

[Jim Meyering]

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  9894f828d474e73b81c3c7a33323a9ca0c9914c2 (commit)
       via  74dc111398feff35e54978d442b9a488c05829b5 (commit)
       via  d7acc337e47563b8334b56c5d479c81a4a060c8f (commit)
       via  d8951d3f4e1bbd564809aa8e713d8333bda2f802 (commit)
      from  a41991d620c7663c0027e25a708c80a70bb70646 (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=9894f828d474e73b81c3c7a33323a9ca0c9914c2


commit 9894f828d474e73b81c3c7a33323a9ca0c9914c2
Author: Paolo Bonzini <address@hidden>
Date:   Sun Feb 5 18:00:46 2012 +0100

    dfa: merge calls to SUCCEEDS_IN_CONTEXT
    
    * src/dfa.c (state_index): use a single call to SUCCEEDS_IN_CONTEXT.

diff --git a/src/dfa.c b/src/dfa.c
index 3e19b40..f3e414d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2014,9 +2014,7 @@ state_index (struct dfa *d, position_set const *s, int 
context)
     if (d->tokens[s->elems[j].index] < 0)
       {
         constraint = s->elems[j].constraint;
-        if (SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NONE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NEWLINE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_LETTER))
+        if (SUCCEEDS_IN_CONTEXT (constraint, context, CTX_ANY))
           d->states[i].constraint |= constraint;
         if (! d->states[i].first_end)
           d->states[i].first_end = d->tokens[s->elems[j].index];

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


commit 9894f828d474e73b81c3c7a33323a9ca0c9914c2
Author: Paolo Bonzini <address@hidden>
Date:   Sun Feb 5 18:00:46 2012 +0100

    dfa: merge calls to SUCCEEDS_IN_CONTEXT
    
    * src/dfa.c (state_index): use a single call to SUCCEEDS_IN_CONTEXT.

diff --git a/src/dfa.c b/src/dfa.c
index 3e19b40..f3e414d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2014,9 +2014,7 @@ state_index (struct dfa *d, position_set const *s, int 
context)
     if (d->tokens[s->elems[j].index] < 0)
       {
         constraint = s->elems[j].constraint;
-        if (SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NONE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NEWLINE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_LETTER))
+        if (SUCCEEDS_IN_CONTEXT (constraint, context, CTX_ANY))
           d->states[i].constraint |= constraint;
         if (! d->states[i].first_end)
           d->states[i].first_end = d->tokens[s->elems[j].index];

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


commit 9894f828d474e73b81c3c7a33323a9ca0c9914c2
Author: Paolo Bonzini <address@hidden>
Date:   Sun Feb 5 18:00:46 2012 +0100

    dfa: merge calls to SUCCEEDS_IN_CONTEXT
    
    * src/dfa.c (state_index): use a single call to SUCCEEDS_IN_CONTEXT.

diff --git a/src/dfa.c b/src/dfa.c
index 3e19b40..f3e414d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2014,9 +2014,7 @@ state_index (struct dfa *d, position_set const *s, int 
context)
     if (d->tokens[s->elems[j].index] < 0)
       {
         constraint = s->elems[j].constraint;
-        if (SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NONE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NEWLINE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_LETTER))
+        if (SUCCEEDS_IN_CONTEXT (constraint, context, CTX_ANY))
           d->states[i].constraint |= constraint;
         if (! d->states[i].first_end)
           d->states[i].first_end = d->tokens[s->elems[j].index];

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


commit 9894f828d474e73b81c3c7a33323a9ca0c9914c2
Author: Paolo Bonzini <address@hidden>
Date:   Sun Feb 5 18:00:46 2012 +0100

    dfa: merge calls to SUCCEEDS_IN_CONTEXT
    
    * src/dfa.c (state_index): use a single call to SUCCEEDS_IN_CONTEXT.

diff --git a/src/dfa.c b/src/dfa.c
index 3e19b40..f3e414d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2014,9 +2014,7 @@ state_index (struct dfa *d, position_set const *s, int 
context)
     if (d->tokens[s->elems[j].index] < 0)
       {
         constraint = s->elems[j].constraint;
-        if (SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NONE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_NEWLINE)
-            || SUCCEEDS_IN_CONTEXT(constraint, context, CTX_LETTER))
+        if (SUCCEEDS_IN_CONTEXT (constraint, context, CTX_ANY))
           d->states[i].constraint |= constraint;
         if (! d->states[i].first_end)
           d->states[i].first_end = d->tokens[s->elems[j].index];

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

Summary of changes:
 NEWS                 |    5 ++
 src/dfa.c            |  146 ++++++++++++++++++++++++-------------------------
 tests/spencer1.tests |   12 ++++
 3 files changed, 89 insertions(+), 74 deletions(-)


hooks/post-receive
-- 
grep