From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Zhu Zihao Newsgroups: gmane.emacs.bugs Subject: bug#38170: 27.0.50; [PATCH] rx.el: Fix misplaced "char" identifiers. Date: Mon, 11 Nov 2019 18:24:10 +0800 Message-ID: <87eeyed839.wl-all_but_last@163.com> Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: multipart/mixed; boundary="Multipart_Mon_Nov_11_18:24:10_2019-1" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="96483"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?Q?Goj=C5=8D?=) APEL/10.8 EasyPG/1.0.0 Emacs/27.0 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) To: 38170@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 11 11:41:52 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iU78p-000Ouo-AA for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Nov 2019 11:41:51 +0100 Original-Received: from localhost ([::1]:50706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU78n-0003m9-GC for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Nov 2019 05:41:49 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU776-0002B8-Ot for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:40:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iU774-0004ZI-Vc for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:40:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44349) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iU773-0004Y2-Ub for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:40:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iU773-0000Rq-QZ for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:40:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Nov 2019 10:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38170 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.15734687771669 (code B ref -1); Mon, 11 Nov 2019 10:40:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 11 Nov 2019 10:39:37 +0000 Original-Received: from localhost ([127.0.0.1]:53170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iU76f-0000Qq-89 for submit@debbugs.gnu.org; Mon, 11 Nov 2019 05:39:37 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:48051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iU76c-0000Qg-4t for submit@debbugs.gnu.org; Mon, 11 Nov 2019 05:39:35 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50707) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iU76a-0001OY-81 for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:39:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iU76W-0003yU-5z for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:39:29 -0500 Original-Received: from mail-m974.mail.163.com ([123.126.97.4]:57460) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iU76U-0003tU-Qu for bug-gnu-emacs@gnu.org; Mon, 11 Nov 2019 05:39:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:Message-ID:From:Subject:MIME-Version; bh=yuXND E6mRkmp0AnZaNv7ObdIaPI3bhs5Usn0bIlM/uc=; b=EkB+2kzZBTnckzg5PGte5 R71EcBgs4BsQVzN0eshDqOFsglgsbAjd3T7MlIehG27s1XvgXPX0rfLxZur67FnU bmU9SDg0LKc4aMk8lsxjFNWdBfApelrDYvDTGKndPrZj9b+0VrKeynLhxdtQb6tC PIWwE/iap5uEwdmdnaBPRY= Original-Received: from archlinux.163.com (unknown [112.93.132.216]) by smtp4 (Coremail) with SMTP id HNxpCgBHj5PNNsldVlziAA--.4S2; Mon, 11 Nov 2019 18:24:16 +0800 (CST) X-Face: :]]%@R1{oDt0%iKgI@Kga#OZ; ogt+%OOne&J4#E*O,TIlI)yEFw--I\:3s~EV97GI$1.1!}8inmF9UgtUBB@#8>'8NWNC8qg/v*OLfQB; Z:@G3HeNf3u& ,&HpBGv%?p{bzsl'|5T";1&X X-CM-TRANSID: HNxpCgBHj5PNNsldVlziAA--.4S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUcS_MUUUUU X-Originating-IP: [112.93.132.216] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKRBqr1Xlt7XAKQAAsn X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] 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: 209.51.188.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:171419 Archived-At: --Multipart_Mon_Nov_11_18:24:10_2019-1 Content-Type: text/plain; charset=US-ASCII New rx implementation introduce some bug: 1. (rx char) throw an error "Unknown rx symbol char" 2. (rx (char ?A ?B)) return a regexp match A or B. This patch aims to fix this. --Multipart_Mon_Nov_11_18:24:10_2019-1 Content-Type: text/plain; type=patch; name="0001-rx.el-Fix-misplaced-char-identifiers.patch"; charset=US-ASCII Content-Disposition: attachment; filename="0001-rx.el-Fix-misplaced-char-identifiers.patch" Content-Transfer-Encoding: 7bit >From 1b5d28b8b2bcbf91ad32991d3602de45ef9bef76 Mon Sep 17 00:00:00 2001 From: Zhu Zihao To: bug-gnu-emacs@gnu.org Date: Sun, 10 Nov 2019 20:02:44 +0800 Subject: 27.0.50; [PATCH] rx.el: Fix misplaced "char" identifiers. --- lisp/emacs-lisp/rx.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 52a35ffa2a7..c5f341a7b0a 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -153,7 +153,7 @@ rx--translate-symbol (pcase sym ;; Use `list' instead of a quoted list to wrap the strings here, ;; since the return value may be mutated. - ((or 'nonl 'not-newline 'any) (cons (list ".") t)) + ((or 'nonl 'not-newline 'any 'char) (cons (list ".") t)) ((or 'anychar 'anything) (cons (list "[^z-a]") t)) ('unmatchable (rx--empty)) ((or 'bol 'line-start) (cons (list "^") 'lseq)) @@ -857,7 +857,7 @@ rx--translate-form (pcase (car form) ((or 'seq : 'and 'sequence) (rx--translate-seq body)) ((or 'or '|) (rx--translate-or body)) - ((or 'any 'in 'char) (rx--translate-any nil body)) + ((or 'any 'in) (rx--translate-any nil body)) ('not-char (rx--translate-any t body)) ('not (rx--translate-not nil body)) -- 2.24.0 --Multipart_Mon_Nov_11_18:24:10_2019-1--