From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24378: [PATCH 4/6] Remove dead loop iterations in regex.c Date: Tue, 6 Sep 2016 15:31:32 +0200 Message-ID: <1473168694-13605-4-git-send-email-mina86@mina86.com> References: <1473168498-13194-1-git-send-email-mina86@mina86.com> <1473168694-13605-1-git-send-email-mina86@mina86.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1473171241 1514 195.159.176.226 (6 Sep 2016 14:14:01 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 6 Sep 2016 14:14:01 +0000 (UTC) To: 24378@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Sep 06 16:13:53 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhH8G-0007Qa-Aq for geb-bug-gnu-emacs@m.gmane.org; Tue, 06 Sep 2016 16:13:48 +0200 Original-Received: from localhost ([::1]:33757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhH8D-0002aM-40 for geb-bug-gnu-emacs@m.gmane.org; Tue, 06 Sep 2016 10:13:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhGTx-0000EX-K4 for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 09:32:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhGTq-0007FC-Lq for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 09:32:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:53296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhGTq-0007F8-I6 for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 09:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bhGTq-0005vc-Ei for bug-gnu-emacs@gnu.org; Tue, 06 Sep 2016 09:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 06 Sep 2016 13:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24378 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24378-submit@debbugs.gnu.org id=B24378.147316870822714 (code B ref 24378); Tue, 06 Sep 2016 13:32:02 +0000 Original-Received: (at 24378) by debbugs.gnu.org; 6 Sep 2016 13:31:48 +0000 Original-Received: from localhost ([127.0.0.1]:50995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhGTc-0005uF-L3 for submit@debbugs.gnu.org; Tue, 06 Sep 2016 09:31:48 -0400 Original-Received: from mail-wm0-f50.google.com ([74.125.82.50]:37360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhGTb-0005tr-7O for 24378@debbugs.gnu.org; Tue, 06 Sep 2016 09:31:47 -0400 Original-Received: by mail-wm0-f50.google.com with SMTP id w12so92328742wmf.0 for <24378@debbugs.gnu.org>; Tue, 06 Sep 2016 06:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6A6KGoXBTQEapOhuPfrxUyKQu7CXikuUQHEiG0KwUis=; b=ZEl/pVoHahp0jgHIWRGYP8bOi9slTrghPvvOgiwEca9A2HXDkHQA1ZI5jU5t4n4WAH D+GMsvb9MfIXyj4TP+7J9IkTbqXmM1jyMuTZh3qt2B7bkoDNTkykoD+GIrRkiKcmtRPO mDpnYw7Ocp5yWAbuLEXNLL5qgeoPZxmNCJ4bV2CxV1QDQXV0jIxLPMHvFoULEJP+ovZV yauE8V4b9bLEqL3Q7PPni1ROtym92030iT5YETyTnALycNRyhMpxN8hCHFwLsA0swHPg DyBhVaZnFI8B1xxUAAU6KuoqV/GKRKOqhapdNNebUTNQ97xXOidBNEmFOAFGq13F5RCK JhMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6A6KGoXBTQEapOhuPfrxUyKQu7CXikuUQHEiG0KwUis=; b=LIfkwc664lFDrIjXc3YS0WO58uxroNM9l5b/LblwhI9ZxbNfdZkygLTM6WhssBfV2s m46Df0QA6+U3IxpEOSfu1fnSJeMnr8lVABU/K4P4A9/hRqEQsoQHU5fBRmJH6CivB0bM Q8dWLG6T9HjLi7UlP8Qb4maHRfl7jwf8cfyQ7YMaO64Q+4wOUqivwyZx/if7hcZhwq00 /rQpyug8MPspBv3pKtkTEwSgDUcsJC46qKbYftEYMGlxB6h9mLZ3x8nsZ/BzH79rm/Yq +25D+eW58DCUdWW415qk63Z2Mz+addMap5BXT/nnPhBsf/sS6Iv4dxBg2p+Ptt9ssFvI h2eA== X-Gm-Message-State: AE9vXwOGMDY4oHxIWjoYdm2KdJ5e50KzWtaI4pP6C8dxDuq3/LhaV1rvNE4bAWqoOtYuwmcb X-Received: by 10.28.109.196 with SMTP id b65mr15182275wmi.68.1473168701248; Tue, 06 Sep 2016 06:31:41 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([172.16.113.135]) by smtp.gmail.com with ESMTPSA id w129sm26561806wmd.9.2016.09.06.06.31.40 for <24378@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2016 06:31:40 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id 9B69A1E0213; Tue, 6 Sep 2016 15:31:39 +0200 (CEST) X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473168694-13605-1-git-send-email-mina86@mina86.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:122993 Archived-At: RE_CHAR_TO_MULTIBYTE(c) yields c for ASCII characters and a byte8 character for c ≥ 0x80. Furthermore, CHAR_BYTE8_P(c) is true only for byte8 characters. This means that c = RE_CHAR_TO_MULTIBYTE (ch); if (! CHAR_BYTE8_P (c) && re_iswctype (c, cc)) is equivalent to: c = c; if (! false && re_iswctype (c, cc)) for 0 ⪬ c < 0x80, and c = BYTE8_TO_CHAR (c); if (! true && re_iswctype (c, cc)) for 0x80 ⪬ c < 0x100. In other words, the loop never executes for c ≥ 0x80 and RE_CHAR_TO_MULTIBYTE call is unnecessary for c < 0x80. * src/regex.c (regex_compile): Simplyfy a for loop by eliminating dead iterations and unnecessary macro calls. --- src/regex.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/regex.c b/src/regex.c index 5f51b43..41c1d3f 100644 --- a/src/regex.c +++ b/src/regex.c @@ -2888,22 +2888,18 @@ regex_compile (const_re_char *pattern, size_t size, done until now. */ SETUP_BUFFER_SYNTAX_TABLE (); - for (ch = 0; ch < 256; ++ch) - { - c = RE_CHAR_TO_MULTIBYTE (ch); - if (! CHAR_BYTE8_P (c) - && re_iswctype (c, cc)) - { - SET_LIST_BIT (ch); - c1 = TRANSLATE (c); - if (c1 == c) - continue; - if (ASCII_CHAR_P (c1)) - SET_LIST_BIT (c1); - else if ((c1 = RE_CHAR_TO_UNIBYTE (c1)) >= 0) - SET_LIST_BIT (c1); - } - } + for (c = 0; c < 0x80; ++c) + if (re_iswctype (c, cc)) + { + SET_LIST_BIT (c); + c1 = TRANSLATE (c); + if (c1 == c) + continue; + if (ASCII_CHAR_P (c1)) + SET_LIST_BIT (c1); + else if ((c1 = RE_CHAR_TO_UNIBYTE (c1)) >= 0) + SET_LIST_BIT (c1); + } SET_RANGE_TABLE_WORK_AREA_BIT (range_table_work, re_wctype_to_bit (cc)); #endif /* emacs */ -- 2.8.0.rc3.226.g39d4020