From unknown Mon Aug 18 11:17:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#16729: suggested small refactoring in dfa.c Resent-From: arnold@skeeve.com Original-Sender: "Debbugs-submit" Resent-CC: bug-grep@gnu.org Resent-Date: Wed, 12 Feb 2014 14:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 16729 X-GNU-PR-Package: grep X-GNU-PR-Keywords: To: 16729@debbugs.gnu.org X-Debbugs-Original-To: bug-grep@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.139221356630084 (code B ref -1); Wed, 12 Feb 2014 14:00:03 +0000 Received: (at submit) by debbugs.gnu.org; 12 Feb 2014 13:59:26 +0000 Received: from localhost ([127.0.0.1]:48398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDaLV-0007p9-NG for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46827) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDaLR-0007oq-OK for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDaLD-0001Bw-Va for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:16 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaLD-0001Bs-Se for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaL7-00025r-Sn for bug-grep@gnu.org; Wed, 12 Feb 2014 08:59:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDaL1-0001Ap-TJ for bug-grep@gnu.org; Wed, 12 Feb 2014 08:59:01 -0500 Received: from frenzy.freefriends.org ([66.54.153.139]:43614 helo=freefriends.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaL1-0001Ab-P1 for bug-grep@gnu.org; Wed, 12 Feb 2014 08:58:55 -0500 X-Envelope-From: arnold@skeeve.com X-Envelope-To: Received: from freefriends.org (localhost [127.0.0.1]) by freefriends.org (8.14.8/8.14.8) with ESMTP id s1CDwsAw012758 for ; Wed, 12 Feb 2014 06:58:54 -0700 Received: (from arnold@localhost) by freefriends.org (8.14.8/8.14.8/submit) id s1CDwrqZ012757 for bug-grep@gnu.org; Wed, 12 Feb 2014 13:58:53 GMT From: arnold@skeeve.com Message-Id: <201402121358.s1CDwrqZ012757@freefriends.org> X-Authentication-Warning: frenzy.freefriends.org: arnold set sender to arnold@skeeve.com using -f Date: Wed, 12 Feb 2014 06:58:53 -0700 User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Jim, Paul. Here is the small refactoring I suggest for dfa.c Thanks, Arnold -------------------- diff --git a/dfa.c b/dfa.c index d5e7fdf..dcd28e5 100644 --- a/dfa.c +++ b/dfa.c @@ -1767,18 +1767,19 @@ 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)) - { - addtok_wc (towupper (wctok)); - addtok (OR); - } + if (! case_fold) + addtok_wc (wctok); + else + { + addtok_wc (towlower (wctok)); + if (iswalpha (wctok)) + { + addtok_wc (towupper (wctok)); + addtok (OR); + } + } tok = lex (); } From unknown Mon Aug 18 11:17:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: arnold@skeeve.com Subject: bug#16729: closed (Re: suggested small refactoring in dfa.c) Message-ID: References: <531184B1.8030501@cs.ucla.edu> <201402121358.s1CDwrqZ012757@freefriends.org> X-Gnu-PR-Message: they-closed 16729 X-Gnu-PR-Package: grep Reply-To: 16729@debbugs.gnu.org Date: Sat, 01 Mar 2014 06:57:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1393657024-20286-1" This is a multi-part message in MIME format... ------------=_1393657024-20286-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #16729: suggested small refactoring in dfa.c which was filed against the grep package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 16729@debbugs.gnu.org. --=20 16729: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D16729 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1393657024-20286-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 16729-done) by debbugs.gnu.org; 1 Mar 2014 06:56:55 +0000 Received: from localhost ([127.0.0.1]:45217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJdqw-0005Gf-JO for submit@debbugs.gnu.org; Sat, 01 Mar 2014 01:56:55 -0500 Received: from smtp.cs.ucla.edu ([131.179.128.62]:35021) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WJdqt-0005GW-0J for 16729-done@debbugs.gnu.org; Sat, 01 Mar 2014 01:56:51 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 8752C39E8015 for <16729-done@debbugs.gnu.org>; Fri, 28 Feb 2014 22:56:50 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R1SgcvAUM4D0 for <16729-done@debbugs.gnu.org>; Fri, 28 Feb 2014 22:56:50 -0800 (PST) Received: from [192.168.1.9] (pool-108-0-233-62.lsanca.fios.verizon.net [108.0.233.62]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 409FC39E8008 for <16729-done@debbugs.gnu.org>; Fri, 28 Feb 2014 22:56:50 -0800 (PST) Message-ID: <531184B1.8030501@cs.ucla.edu> Date: Fri, 28 Feb 2014 22:56:49 -0800 From: Paul Eggert Organization: UCLA Computer Science Department User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: 16729-done@debbugs.gnu.org Subject: Re: suggested small refactoring in dfa.c Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 16729-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) My recent changes to dfa.c have incorporated the removal of that "if (0)" and have refactored the rest so I'm marking this bug as done. ------------=_1393657024-20286-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 12 Feb 2014 13:59:26 +0000 Received: from localhost ([127.0.0.1]:48398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDaLV-0007p9-NG for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:26 -0500 Received: from eggs.gnu.org ([208.118.235.92]:46827) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WDaLR-0007oq-OK for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDaLD-0001Bw-Va for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:16 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaLD-0001Bs-Se for submit@debbugs.gnu.org; Wed, 12 Feb 2014 08:59:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaL7-00025r-Sn for bug-grep@gnu.org; Wed, 12 Feb 2014 08:59:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDaL1-0001Ap-TJ for bug-grep@gnu.org; Wed, 12 Feb 2014 08:59:01 -0500 Received: from frenzy.freefriends.org ([66.54.153.139]:43614 helo=freefriends.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDaL1-0001Ab-P1 for bug-grep@gnu.org; Wed, 12 Feb 2014 08:58:55 -0500 X-Envelope-From: arnold@skeeve.com X-Envelope-To: Received: from freefriends.org (localhost [127.0.0.1]) by freefriends.org (8.14.8/8.14.8) with ESMTP id s1CDwsAw012758 for ; Wed, 12 Feb 2014 06:58:54 -0700 Received: (from arnold@localhost) by freefriends.org (8.14.8/8.14.8/submit) id s1CDwrqZ012757 for bug-grep@gnu.org; Wed, 12 Feb 2014 13:58:53 GMT From: arnold@skeeve.com Message-Id: <201402121358.s1CDwrqZ012757@freefriends.org> X-Authentication-Warning: frenzy.freefriends.org: arnold set sender to arnold@skeeve.com using -f Date: Wed, 12 Feb 2014 06:58:53 -0700 To: bug-grep@gnu.org Subject: suggested small refactoring in dfa.c User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Hi Jim, Paul. Here is the small refactoring I suggest for dfa.c Thanks, Arnold -------------------- diff --git a/dfa.c b/dfa.c index d5e7fdf..dcd28e5 100644 --- a/dfa.c +++ b/dfa.c @@ -1767,18 +1767,19 @@ 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)) - { - addtok_wc (towupper (wctok)); - addtok (OR); - } + if (! case_fold) + addtok_wc (wctok); + else + { + addtok_wc (towlower (wctok)); + if (iswalpha (wctok)) + { + addtok_wc (towupper (wctok)); + addtok (OR); + } + } tok = lex (); } ------------=_1393657024-20286-1--