Add support for &rest in `seq-let'
* lisp/emacs-lisp/seq.el (seq--make-bindings): Add support for `&rest' in the argument list. * test/automated/seq-tests.el: Add a test for parsing and binding `&rest' in `seq-let'.
This commit is contained in:
parent
b096be2aa8
commit
6cd7415598
2 changed files with 27 additions and 14 deletions
|
@ -42,7 +42,8 @@
|
|||
|
||||
;;; TODO:
|
||||
|
||||
;; - Add support for &rest in the argument list of seq-let
|
||||
;; - Add a pcase macro named using `pcase-defmacro' that `seq-let'
|
||||
;; - could wrap.
|
||||
|
||||
;;; Code:
|
||||
|
||||
|
@ -350,20 +351,28 @@ This is an optimization for lists in `seq-take-while'."
|
|||
(font-lock-add-keywords 'emacs-lisp-mode
|
||||
'("\\<seq-doseq\\>" "\\<seq-let\\>")))
|
||||
|
||||
(defun seq--make-bindings (args seq &optional initial-bindings)
|
||||
"Return an alist of bindings of the variables in ARGS to the elements of SEQ.
|
||||
if INITIAL-BINDINGS is non-nil, append new bindings to it, and
|
||||
return INITIAL-BINDINGS."
|
||||
(let ((index 0))
|
||||
(defun seq--make-bindings (args seq &optional bindings)
|
||||
"Return a list of bindings of the variables in ARGS to the elements of SEQ.
|
||||
if BINDINGS is non-nil, append new bindings to it, and
|
||||
return BINDINGS."
|
||||
(let ((index 0)
|
||||
(rest-bound nil))
|
||||
(seq-doseq (name args)
|
||||
(if (sequencep name)
|
||||
(setq initial-bindings (seq--make-bindings
|
||||
(seq--elt-safe args index)
|
||||
`(seq--elt-safe ,seq ,index)
|
||||
initial-bindings))
|
||||
(push `(,name (seq--elt-safe ,seq ,index)) initial-bindings))
|
||||
(unless rest-bound
|
||||
(pcase name
|
||||
((pred seq-p)
|
||||
(setq bindings (seq--make-bindings (seq--elt-safe args index)
|
||||
`(seq--elt-safe ,seq ,index)
|
||||
bindings)))
|
||||
(`&rest
|
||||
(progn (push `(,(seq--elt-safe args (1+ index))
|
||||
(seq-drop ,seq ,index))
|
||||
bindings)
|
||||
(setq rest-bound t)))
|
||||
(t
|
||||
(push `(,name (seq--elt-safe ,seq ,index)) bindings))))
|
||||
(setq index (1+ index)))
|
||||
initial-bindings))
|
||||
bindings))
|
||||
|
||||
(defun seq--elt-safe (seq n)
|
||||
"Return element of SEQ at the index N.
|
||||
|
|
|
@ -283,7 +283,11 @@ Evaluate BODY for each created sequence.
|
|||
(should (= b 2))
|
||||
(should (= c 3))
|
||||
(should (= d 4))
|
||||
(should (null e))))
|
||||
(should (null e)))
|
||||
(seq-let (a b &rest others) seq
|
||||
(should (= a 1))
|
||||
(should (= b 2))
|
||||
(should (same-contents-p others (seq-drop seq 2)))))
|
||||
(let ((seq '(1 (2 (3 (4))))))
|
||||
(seq-let (_ (_ (_ (a)))) seq
|
||||
(should (= a 4))))
|
||||
|
|
Loading…
Add table
Reference in a new issue