[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer
From: |
Tino Calancha |
Subject: |
bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer |
Date: |
Sat, 08 Apr 2017 22:49:48 +0900 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) |
Noam Postavsky <npostavs@users.sourceforge.net> writes:
> On Fri, Apr 7, 2017 at 10:47 AM, Tino Calancha <tino.calancha@gmail.com>
> wrote:
>> +
>> +@example
>> +(cl-loop for x being the matches of "^(defun \\(\\S +\\)"
>> + using '(group 1 limit 10)
>> + collect x)
>> +@end example
>
> You can reuse the existing 'repeat N' clause instead of 'using (limit N)'.
>
> (cl-loop for x being the matches of "^(defun \\(\\S +\\)" using (group 1)
> repeat 10
> collect x)
Right! Thank you.
I fixed some other parts of the patch as well.
--8<-----------------------------cut here---------------start------------->8---
commit fc2eed78e8c5591c3aad358a885b4b5bae6c1041
Author: Tino Calancha <tino.calancha@gmail.com>
Date: Sat Apr 8 22:49:10 2017 +0900
New clause in cl-loop to iterate in the matches of a regexp
Add new clause in cl-loop facility to loop over the matches for
REGEXP in the current buffer (Bug#26338).
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause): Add new clause.
(cl-loop): update docstring.
* doc/misc/cl.texi (For Clauses): Document the new clause.
* etc/NEWS: Mention this change.
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 2339d57631..40b90d6003 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -2030,6 +2030,22 @@ For Clauses
This clause iterates over a sequence, with @var{var} a @code{setf}-able
reference onto the elements; see @code{in-ref} above.
+@item for @var{var} being the matches of @var{regexp}
+This clause iterates over the matches for @var{regexp} in the current buffer.
+By default, @var{var} is bound to the full match. Optionally, @var{var}
+might be bound to a subpart of the match.
+For example,
+
+@example
+(cl-loop for x being the matches of "^(defun \\(\\S +\\)" using (group 1)
+ repeat 10
+ collect x)
+@end example
+
+@noindent
+collects the next 10 function names after point.
+This clause is an extension to standard Common Lisp.
+
@item for @var{var} being the symbols [of @var{obarray}]
This clause iterates over symbols, either over all interned symbols
or over all symbols in @var{obarray}. The loop is executed with
@@ -2487,8 +2503,8 @@ Other Clauses
This package's @code{cl-loop} macro is compatible with that of Common
Lisp, except that a few features are not implemented: @code{loop-finish}
and data-type specifiers. Naturally, the @code{for} clauses that
-iterate over keymaps, overlays, intervals, frames, windows, and
-buffers are Emacs-specific extensions.
+iterate over keymaps, overlays, intervals, frames, windows, buffers, and
+matches for a regexp in the current buffer are Emacs-specific extensions.
@node Multiple Values
@section Multiple Values
diff --git a/etc/NEWS b/etc/NEWS
index e351abc159..b8298bf180 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -862,6 +862,10 @@ instead of its first.
* Lisp Changes in Emacs 26.1
+++
+** New clause in cl-loop to iterate in the matches for a regexp
+in the current buffer.
+
++++
** Emacs now supports records for user-defined types, via the new
functions 'make-record', 'record', and 'recordp'. Records are now
used internally to represent cl-defstruct and defclass instances, for
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index ecb89fd51d..4710efd0a9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -892,6 +892,7 @@ cl-loop
the overlays/intervals [of BUFFER] [from POS1] [to POS2]
the frames/buffers
the windows [of FRAME]
+ the matches of/for REGEXP [using (group GROUP)]
Iteration clauses:
repeat INTEGER
while/until/always/never/thereis CONDITION
@@ -1339,6 +1340,24 @@ cl--parse-loop-clause
(push (list temp-idx `(1+ ,temp-idx))
loop-for-steps)))
+ ((memq word '(match matches))
+ (let* ((_ (or (and (not (memq (car cl--loop-args) '(of for)))
+ (error "Expected `of'"))))
+ (regexp `(if (stringp ,(cadr cl--loop-args))
+ ,(cl--pop2 cl--loop-args)
+ (error "Regexp must be an string")))
+ (group
+ (if (eq (car cl--loop-args) 'using)
+ (if (and (= (length (cadr cl--loop-args)) 2)
+ (eq (cl-caadr cl--loop-args) 'group))
+ (cadr (cl--pop2 cl--loop-args))
+ (error "Bad `using' clause"))
+ 0)))
+ (push (list var nil) loop-for-bindings)
+ (push `(re-search-forward ,regexp nil t) cl--loop-body)
+ (push (list var `(match-string-no-properties ,group))
+ loop-for-sets)))
+
((memq word hash-types)
(or (memq (car cl--loop-args) '(in of))
(error "Expected `of'"))
--8<-----------------------------cut here---------------end--------------->8---
In GNU Emacs 26.0.50 (build 14, x86_64-pc-linux-gnu, GTK+ Version 3.22.11)
of 2017-04-08
Repository revision: 4fbfd7ad53810153371a588a9bd1a69230f60dd5
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, (continued)
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, npostavs, 2017/04/08
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, Philipp Stephani, 2017/04/22
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, Juri Linkov, 2017/04/05
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, Tino Calancha, 2017/04/07
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, Noam Postavsky, 2017/04/07
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer, Drew Adams, 2017/04/07
- bug#26338: 26.0.50; Collect all matches for REGEXP in current buffer,
Tino Calancha <=