[debbugs-tracker] bug#16581: closed (suggested code simplification in dfa.c)

[GNU bug Tracking System]

Your message dated Sat, 08 Mar 2014 10:16:45 -0800
with message-id <address@hidden>
and subject line Re:  suggested code simplification in dfa.c
has caused the debbugs.gnu.org bug report #16581,
regarding suggested code simplification in dfa.c
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
16581: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16581
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> suggested code simplification in dfa.c
>
>
>
>
> Date: 
>
> Tue, 28 Jan 2014 22:11:14 +0200
>
>
>
>
> User-agent: 
>
> Heirloom mailx 12.5 6/20/10
>
>
>
>
> Hi.
>
> The code in atom() looks to me like it could use a little refactoring
> and simplification. I suggest the diff below. With it both grep and gawk
> still pass their tests.
>
> Thanks,
>
> Arnold
>
> diff --git a/src/dfa.c b/src/dfa.c
> index b79c604..d2916ee 100644
> --- a/src/dfa.c
> +++ b/src/dfa.c
> @@ -1725,17 +1725,20 @@ add_utf8_anychar (void)
>  static void
>  atom (void)
>  {
> -  if (0)
> +  if (MBS_SUPPORT && tok == WCHAR)
>      {
> -      /* empty */
> -    }
> -  else if (MBS_SUPPORT && tok == WCHAR)
> -    {
> -      addtok_wc (case_fold ? towlower (wctok) : wctok);
> -      if (case_fold && iswalpha (wctok))
> +      if (! case_fold)
> +        {
> +          addtok_wc (wctok);
> +        }
> +      else
>          {
> -          addtok_wc (towupper (wctok));
> -          addtok (OR);
> +          addtok_wc (towlower (wctok));
> +          if (iswalpha (wctok))
> +         {
> +                addtok_wc (towupper (wctok));
> +                addtok (OR);
> +         }
>          }
>  
>        tok = lex ();
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re:  suggested code simplification in dfa.c
>
>
>
>
> Date: 
>
> Sat, 08 Mar 2014 10:16:45 -0800
>
>
>
>
> User-agent: 
>
> Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0
>
>
>
>
> This particular issue seems to have been put to bed in the savannah git 
> master so I'm marking it as done.
>
>
> --- End Message ---