(dolist, dotimes): Moved from cl-macs.el.

diff --git a/lisp/subr.el b/lisp/subr.el
index 683bc2479419b1fa1df354c5bc609cfed2356887..ed75461917448895570249f2c22df6e9a576530f 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -78,6 +78,32 @@ change the list."
 (put 'unless 'lisp-indent-function 1)
 (put 'unless 'edebug-form-spec '(&rest form))
 
+(defmacro dolist (spec &rest body)
+  "(dolist (VAR LIST [RESULT]) BODY...): loop over a list.
+Evaluate BODY with VAR bound to each car from LIST, in turn.
+Then evaluate RESULT to get return value, default nil."
+  (let ((temp (gensym "--dolist-temp--")))
+    (list 'block nil
+         (list* 'let (list (list temp (nth 1 spec)) (car spec))
+                (list* 'while temp (list 'setq (car spec) (list 'car temp))
+                       (append body (list (list 'setq temp
+                                                (list 'cdr temp)))))
+                (if (cdr (cdr spec))
+                    (cons (list 'setq (car spec) nil) (cdr (cdr spec)))
+                  '(nil))))))
+
+(defmacro dotimes (spec &rest body)
+  "(dotimes (VAR COUNT [RESULT]) BODY...): loop a certain number of times.
+Evaluate BODY with VAR bound to successive integers running from 0,
+inclusive, to COUNT, exclusive.  Then evaluate RESULT to get
+the return value (nil if RESULT is omitted)."
+  (let ((temp (gensym "--dotimes-temp--")))
+    (list 'block nil
+         (list* 'let (list (list temp (nth 1 spec)) (list (car spec) 0))
+                (list* 'while (list '< (car spec) temp)
+                       (append body (list (list 'incf (car spec)))))
+                (or (cdr (cdr spec)) '(nil))))))
+
 (defsubst caar (x)
   "Return the car of the car of X."
   (car (car x)))