bug#1518: marked as done (`rx' making nested `or' forms in a `group' wrong)

[don@donarmstrong.com (Emacs bug Tracking System)]

[-- Attachment #1: Type: text/plain, Size: 889 bytes --]


Your message dated Tue, 09 Dec 2008 16:17:29 -0500
with message-id <jwvzlj5uk1b.fsf-monnier+emacsbugreports@gnu.org>
and subject line Re: bug#1518: `rx' making nested `or' forms in a `group' wrong
has caused the Emacs bug report #1518,
regarding `rx' making nested `or' forms in a `group' wrong
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact don@donarmstrong.com
immediately.)


-- 
1518: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=1518
Emacs Bug Tracking System
Contact don@donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 7604 bytes --]

From: Derick Eddington <derick.eddington@gmail.com>
To: bug-gnu-emacs@gnu.org
Subject: `rx' making nested `or' forms in a `group' wrong
Date: Mon, 08 Dec 2008 20:19:20 -0800
Message-ID: <1228796360.10749.17.camel@eep>

This one is wrong:

(rx (seq (group "foo" (or (or "asdf" "lkjh") "zab")) "bar"))
=>
"\\(foo\\(?:asdf\\|lkjh\\)\\|zab\\)bar"

This similar one without the group is correct:

(rx (seq "foo" (or (or "asdf" "lkjh") "zab") "bar"))
=>
"foo\\(?:\\(?:asdf\\|lkjh\\)\\|zab\\)bar"


-- 
: Derick
----------------------------------------------------------------


In GNU Emacs 23.0.60.1 (i486-pc-linux-gnu, GTK+ Version 2.14.3)
 of 2008-10-13 on rothera, modified by Debian
 (emacs-snapshot package, version 1:20081013-1)
Windowing system distributor `The X.Org Foundation', version 11.0.10502000
configured using `configure  '--build' 'i486-linux-gnu' '--host' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs-snapshot:/etc/emacs:/usr/local/share/emacs/23.0.60/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.0.60/site-lisp:/usr/share/emacs/site-lisp' '--with-x=yes' '--with-x-toolkit=gtk' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -DSITELOAD_PURESIZE_EXTRA=5000 -g -O2' 'LDFLAGS=-g -Wl,--as-needed' 'CPPFLAGS=''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_US.UTF-8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default-enable-multibyte-characters: t

Major mode: Text

Minor modes in effect:
  show-paren-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  global-auto-composition-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> ) <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> g r o u p SPC <left> <left> <left> 
<left> <left> <left> <left> <left> <right> <end> C-j 
<up> <up> <S-down> M-w <up> <up> <return> <return> 
<down> <backspace> <backspace> <down> <down> <down> 
C-y <up> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <left> <left> 
C-M-SPC C-M-SPC C-w <left> <left> <left> <left> <left> 
<left> <left> C-y C-M-k <right> <right> <right> <right> 
<right> <right> <right> <right> C-j <up> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<left> <left> <left> <left> <left> <left> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <left> 
<left> <left> <left> <left> <left> <left> <left> <up> 
<up> <up> <left> <left> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<right> <right> <right> <right> <right> <right> <right> 
<up> <down> <up> <left> <left> <left> <left> <down-mouse-1> 
<mouse-1> <help-echo> <down-mouse-1> <mouse-1> <down-mouse-1> 
<mouse-1> M-x r e p o r t - e m a c s - b u <tab> 
<return>

Recent messages:
1 match
Making completion list...
Mark set [4 times]
Quit
Mark set [5 times]
Entering debugger...
Mark set [2 times]
Entering debugger...
Undo! [2 times]
Mark set [8 times]






[-- Attachment #3: Type: message/rfc822, Size: 2784 bytes --]

From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Derick Eddington <derick.eddington@gmail.com>
Cc: 1518-done@emacsbugs.donarmstrong.com
Subject: Re: bug#1518: `rx' making nested `or' forms in a `group' wrong
Date: Tue, 09 Dec 2008 16:17:29 -0500
Message-ID: <jwvzlj5uk1b.fsf-monnier+emacsbugreports@gnu.org>

> This one is wrong:
> (rx (seq (group "foo" (or (or "asdf" "lkjh") "zab")) "bar"))
> =>
> "\\(foo\\(?:asdf\\|lkjh\\)\\|zab\\)bar"

I've installed the patch below which should fix it.
Thank you for your help.


        Stefan


Index: lisp/emacs-lisp/rx.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/rx.el,v
retrieving revision 1.29
diff -u -r1.29 rx.el
--- lisp/emacs-lisp/rx.el	7 Oct 2008 18:08:26 -0000	1.29
+++ lisp/emacs-lisp/rx.el	9 Dec 2008 21:13:50 -0000
@@ -666,7 +666,13 @@
 
 (defun rx-submatch (form)
   "Parse and produce code from FORM, which is `(submatch ...)'."
-  (concat "\\(" (mapconcat #'rx-form (cdr form) nil) "\\)"))
+  (concat "\\("
+          (if (= 2 (length form))
+              ;; Only one sub-form.
+              (rx-form (cadr form))
+            ;; Several sub-forms implicitly concatenated.
+            (mapconcat (lambda (re) (rx-form re ':)) (cdr form) nil))
+          "\\)"))
 
 
 (defun rx-backref (form)