Re: suggested fixes for dfa.c

[Jim Meyering]

Jim Meyering wrote:

> Aharon Robbins wrote:
>> Upon comparing grep's dfa.c to the development gawk, I suggest the
>> following fixes.
>>
>> 1. Remove the #ifdef GAWK - upcoming gawk supports \s and \S
>> 2. Move add_utf8_anychar into the MBS_SUPPORT #ifdef.  This latter has
>>    been reported on the list before - I thought it'd been checked in even.
>>    :-)
>
> Thanks for the patch.
>
> However, would you please convert those to two actual commits (in a cloned
> grep working directory), each with its own commit log?  Then you can send
> the output of "git format-patch --stdout -2 -p" and I can simply run
> "git am EACH_MESSAGE" to apply them without hassling with attribution --
> you'll be listed as the "Author" -- separating them, or writing log messages.

Thanks.
I've just pushed these:

>From 4044a76685ace1426f611a8341acc6ec1540b711 Mon Sep 17 00:00:00 2001
From: Arnold D. Robbins <address@hidden>
Date: Sun, 1 May 2011 20:19:21 +0300
Subject: [PATCH 1/2] maint: remove GAWK ifndef; no longer needed

---
 src/dfa.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index 5f95ac9..bc23555 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1336,7 +1336,6 @@ lex (void)
           laststart = 0;
           return lasttok = CSET + charclass_index(ccl);

-#ifndef GAWK
         case 's':
         case 'S':
           if (!backslash || (syntax_bits & RE_NO_GNU_OPS))
@@ -1349,7 +1348,6 @@ lex (void)
             notset(ccl);
           laststart = 0;
           return lasttok = CSET + charclass_index(ccl);
-#endif

         case 'w':
         case 'W':
--
1.7.5.141.g791a


>From 30e9a3b76955891191b50935ad92435f2f84fab9 Mon Sep 17 00:00:00 2001
From: Arnold D. Robbins <address@hidden>
Date: Sun, 1 May 2011 20:20:18 +0300
Subject: [PATCH 2/2] build: move add_utf8_anychar into MBS ifdef

---
 src/dfa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index bc23555..f2064ed 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1485,7 +1485,6 @@ addtok_wc (wint_t wc)
       addtok(CAT);
     }
 }
-#endif

 static void
 add_utf8_anychar (void)
@@ -1535,6 +1534,7 @@ add_utf8_anychar (void)
       addtok (OR);
     }
 }
+#endif

 /* The grammar understood by the parser is as follows.

--
1.7.5.141.g791a