From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tak Ota Newsgroups: gmane.emacs.devel Subject: Re: collect-string Date: Fri, 3 Dec 2010 15:15:40 -0800 Message-ID: <20101203.151540.127977418.Takaaki.Ota@am.sony.com> References: <20101203.143147.319196666.Takaaki.Ota@am.sony.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1291418161 4584 80.91.229.12 (3 Dec 2010 23:16:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 3 Dec 2010 23:16:01 +0000 (UTC) Cc: stephen@xemacs.org, emacs-devel@gnu.org To: Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 04 00:15:56 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1POeqx-0007ey-6d for ged-emacs-devel@m.gmane.org; Sat, 04 Dec 2010 00:15:50 +0100 Original-Received: from localhost ([127.0.0.1]:53157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POeqv-000363-W0 for ged-emacs-devel@m.gmane.org; Fri, 03 Dec 2010 18:15:46 -0500 Original-Received: from [140.186.70.92] (port=47351 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POeqr-00035y-Df for emacs-devel@gnu.org; Fri, 03 Dec 2010 18:15:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POeqp-0000b8-Ut for emacs-devel@gnu.org; Fri, 03 Dec 2010 18:15:41 -0500 Original-Received: from db3ehsobe006.messaging.microsoft.com ([213.199.154.144]:11415 helo=DB3EHSOBE006.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POeqp-0000b4-Ed for emacs-devel@gnu.org; Fri, 03 Dec 2010 18:15:39 -0500 Original-Received: from mail115-db3-R.bigfish.com (10.3.81.254) by DB3EHSOBE006.bigfish.com (10.3.84.26) with Microsoft SMTP Server id 14.1.225.8; Fri, 3 Dec 2010 23:15:37 +0000 Original-Received: from mail115-db3 (localhost.localdomain [127.0.0.1]) by mail115-db3-R.bigfish.com (Postfix) with ESMTP id 9C2E8468106; Fri, 3 Dec 2010 23:15:37 +0000 (UTC) X-SpamScore: -27 X-BigFish: VPS-27(zz1102K1432N98dN11f6N179dNzz1202hzzz2fh2a8h668h61h) X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:mail7.fw-bc.sony.com; RD:mail7.fw-bc.sony.com; EFVD:NLI Original-Received: from mail115-db3 (localhost.localdomain [127.0.0.1]) by mail115-db3 (MessageSwitch) id 1291418136882176_29782; Fri, 3 Dec 2010 23:15:36 +0000 (UTC) Original-Received: from DB3EHSMHS001.bigfish.com (unknown [10.3.81.243]) by mail115-db3.bigfish.com (Postfix) with ESMTP id D3A7D111804C; Fri, 3 Dec 2010 23:15:36 +0000 (UTC) Original-Received: from mail7.fw-bc.sony.com (160.33.98.74) by DB3EHSMHS001.bigfish.com (10.3.87.101) with Microsoft SMTP Server (TLS) id 14.1.225.8; Fri, 3 Dec 2010 23:15:36 +0000 Original-Received: from mail1x.bc.in.sel.sony.com ([43.144.65.112]) by mail7.fw-bc.sony.com (Switch-3.4.2/Switch-3.3.2mp) with ESMTP id oB3NFYWh021749 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 3 Dec 2010 23:15:34 GMT Original-Received: from localhost (tak-vaio-z1290-043191017095.am.sony.com [43.191.17.95]) by mail1x.bc.in.sel.sony.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id oB3NFXBO013479; Fri, 3 Dec 2010 23:15:33 GMT In-Reply-To: X-Mailer: Mew-6.3.50 on Emacs-23.2.90.1 (i386-mingw-nt6.1.7600 built on 2010-11-22) X-OriginatorOrg: am.sony.com X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:133378 Archived-At: Fri, 3 Dec 2010 14:56:51 -0800: Stefan Monnier wrote: > >> > ! '(0) > >> > ! ;; construct a list of subexpression integers > >> > ! (mapcar 'string-to-number > >> > ! (split-string > >> > ! (let ((default (car occur-collect-submatch-history))) > >> > ! (read-from-minibuffer > >> > ! (format "Subexpressions to collect (default %s): " default) > >> > ! "" nil nil 'occur-collect-submatch-history default) > >> > ! (car occur-collect-submatch-history))))) > >> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > >> > >> This should be `default', right? > > > No, this is the new input value as read-from-minibuffer prepends this > > value to the history. > > Oh, right, there's more parens than I thought. You should use > `read-string' instead, which will take care of this ugliness. OK, done. Indeed its cleaner. *** ../../../d/pub/emacs/emacs-23.2.90/lisp/replace.el Thu Dec 2 16:33:19 2010 --- replace.el Fri Dec 3 15:07:56 2010 *************** *** 527,532 **** --- 527,535 ---- Maximum length of the history list is determined by the value of `history-length', which see.") + (defvar occur-collect-regexp-history '("\\1") + "History of regexp for occur's collect operation") + (defun read-regexp (prompt &optional default-value) "Read regexp as a string using the regexp history and some useful defaults. Prompt for a regular expression with PROMPT (without a colon and *************** *** 1028,1037 **** (nreverse result)))) (defun occur-read-primary-args () ! (list (read-regexp "List lines matching regexp" ! (car regexp-history)) ! (when current-prefix-arg ! (prefix-numeric-value current-prefix-arg)))) (defun occur-rename-buffer (&optional unique-p interactive-p) "Rename the current *Occur* buffer to *Occur: original-buffer-name*. --- 1031,1055 ---- (nreverse result)))) (defun occur-read-primary-args () ! (let* ((perform-collect (consp current-prefix-arg)) ! (regexp (read-regexp (if perform-collect ! "Collect strings matching regexp" ! "List lines matching regexp") ! (car regexp-history)))) ! (list regexp ! (if perform-collect ! ;; Perform collect operation ! (if (zerop (regexp-opt-depth regexp)) ! ;; No subexpression so collect the entire match. ! "\\&" ! ;; Get the regexp for collection pattern. ! (let ((default (car occur-collect-regexp-history))) ! (read-string ! (format "Regexp to collect (default %s): " default) ! nil 'occur-collect-regexp-history default))) ! ;; Otherwise normal occur takes numerical prefix argument. ! (when current-prefix-arg ! (prefix-numeric-value current-prefix-arg)))))) (defun occur-rename-buffer (&optional unique-p interactive-p) "Rename the current *Occur* buffer to *Occur: original-buffer-name*. *************** *** 1064,1070 **** \\\\[describe-mode] in that buffer will explain how. If REGEXP contains upper case characters (excluding those preceded by `\\') ! and `search-upper-case' is non-nil, the matching is case-sensitive." (interactive (occur-read-primary-args)) (occur-1 regexp nlines (list (current-buffer)))) --- 1082,1099 ---- \\\\[describe-mode] in that buffer will explain how. If REGEXP contains upper case characters (excluding those preceded by `\\') ! and `search-upper-case' is non-nil, the matching is case-sensitive. ! ! When NLINES is a string or when the function is called ! interactively with prefix argument without a number (`C-u' alone ! as prefix) the matching strings are collected into the `*Occur*' ! buffer by using NLINES as a replacement regexp. NLINES may ! contain \\& and \\N which convention follows `replace-match'. ! For example, providing \"defun\\s +\\(\\S +\\)\" for REGEXP and ! \"\\1\" for NLINES collects all the function names in a lisp ! program. When there is no parenthesized subexpressions in REGEXP ! the entire match is collected. In any case the searched buffers ! are not modified." (interactive (occur-read-primary-args)) (occur-1 regexp nlines (list (current-buffer)))) *************** *** 1146,1165 **** (setq occur-buf (get-buffer-create buf-name)) (with-current-buffer occur-buf ! (occur-mode) (let ((inhibit-read-only t) ;; Don't generate undo entries for creation of the initial contents. (buffer-undo-list t)) (erase-buffer) ! (let ((count (occur-engine ! regexp active-bufs occur-buf ! (or nlines list-matching-lines-default-context-lines) ! (if (and case-fold-search search-upper-case) ! (isearch-no-upper-case-p regexp t) ! case-fold-search) ! list-matching-lines-buffer-name-face ! nil list-matching-lines-face ! (not (eq occur-excluded-properties t))))) (let* ((bufcount (length active-bufs)) (diff (- (length bufs) bufcount))) (message "Searched %d buffer%s%s; %s match%s for `%s'" --- 1175,1217 ---- (setq occur-buf (get-buffer-create buf-name)) (with-current-buffer occur-buf ! (if (stringp nlines) ! (fundamental-mode) ;; This is for collect opeartion. ! (occur-mode)) (let ((inhibit-read-only t) ;; Don't generate undo entries for creation of the initial contents. (buffer-undo-list t)) (erase-buffer) ! (let ((count ! (if (stringp nlines) ! ;; Treat nlines as a regexp to collect. ! (let ((bufs active-bufs) ! (count 0)) ! (while bufs ! (with-current-buffer (car bufs) ! (save-excursion ! (goto-char (point-min)) ! (while (re-search-forward regexp nil t) ! ;; Insert the replacement regexp. ! (let ((str (match-substitute-replacement nlines))) ! (if str ! (with-current-buffer occur-buf ! (insert str) ! (setq count (1+ count)) ! (or (zerop (current-column)) ! (insert "\n")))))))) ! (setq bufs (cdr bufs))) ! count) ! ;; Perform normal occur. ! (occur-engine ! regexp active-bufs occur-buf ! (or nlines list-matching-lines-default-context-lines) ! (if (and case-fold-search search-upper-case) ! (isearch-no-upper-case-p regexp t) ! case-fold-search) ! list-matching-lines-buffer-name-face ! nil list-matching-lines-face ! (not (eq occur-excluded-properties t)))))) (let* ((bufcount (length active-bufs)) (diff (- (length bufs) bufcount))) (message "Searched %d buffer%s%s; %s match%s for `%s'" > >> Hmm... I didn't think of NLINES turning into a list of submatch-numbers, > >> but that makes me think that maybe we should go one step further and > >> turn it into a string, like the ones used in replace-match. > > This is truly brilliant. Thank you very much. I love this idea > > bouncing process. See below. > > It's not always as successful, sadly. But yes, it turned out very well > this time. As long as people behave rationally with patience and not carried too much away by own belief it should work fine most of the time. I'm glad I haven't been involved in sad cases. -Tak