X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/d6caa73bc6253f7a0461406a939865a207bad7c8..53ccd04251004c520ab714e8ffc5b80f40536459:/mdw-base.lisp

diff --git a/mdw-base.lisp b/mdw-base.lisp
index a41b685..ec86987 100644
--- a/mdw-base.lisp
+++ b/mdw-base.lisp
@@ -66,7 +66,7 @@
   "Debugging tool: print the expression X and its values."
   (let ((tmp (gensym)))
     `(let ((,tmp (multiple-value-list ,x)))
-       (format t "~&")
+       (fresh-line)
        (pprint-logical-block (*standard-output* nil :per-line-prefix ";; ")
 	 (format t
 		 "~S = ~@_~:I~:[#<no values>~;~:*~{~S~^ ~_~}~]"
@@ -195,7 +195,7 @@
 (defmacro with-gensyms (syms &body body)
   "Everyone's favourite macro helper."
   `(let (,@(mapcar (lambda (sym) `(,sym (gensym ,(symbol-name sym))))
-                   (listify syms)))
+		   (listify syms)))
      ,@body))
 
 (defmacro let*/gensyms (binds &body body)
@@ -204,16 +204,16 @@
    each VAR is bound to a gensym, and in the final expansion, each of those
    gensyms will be bound to the corresponding VALUE."
   (labels ((more (binds)
-             (let ((tmp (gensym "TMP")) (bind (car binds)))
-               `((let ((,tmp ,(cadr bind))
-                       (,(car bind) (gensym ,(symbol-name (car bind)))))
-                   `(let ((,,(car bind) ,,tmp))
-                      ,,@(if (cdr binds)
-                             (more (cdr binds))
-                             body)))))))
+	     (let ((tmp (gensym "TMP")) (bind (car binds)))
+	       `((let ((,tmp ,(cadr bind))
+		       (,(car bind) (gensym ,(symbol-name (car bind)))))
+		   `(let ((,,(car bind) ,,tmp))
+		      ,,@(if (cdr binds)
+			     (more (cdr binds))
+			     body)))))))
     (if (null binds)
-        `(progn ,@body)
-        (car (more (mapcar #'pairify (listify binds)))))))
+	`(progn ,@body)
+	(car (more (mapcar #'pairify (listify binds)))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Some simple yet useful control structures.
@@ -227,7 +227,7 @@
 	    collect val into vals
 	    finally (return (values vars vals)))
     `(labels ((,name ,vars
-	        ,@body))
+		,@body))
        (,name ,@vals))))
 
 (defmacro while (cond &body body)
@@ -253,7 +253,7 @@
 			       (list `(let ((,(or vary varx) ,argument)
 					    ,@(and vary
 						   `((,varx ,scrutinee))))
-				        ,@forms))
+					,@forms))
 			       forms))))
 		   clauses)))))
 
@@ -298,7 +298,7 @@
     (doit specs)))
 
 ;;;--------------------------------------------------------------------------
-;;; with-places
+;;; Capturing places as symbols.
 
 (defmacro %place-ref (getform setform newtmp)
   "Grim helper macro for with-places."
@@ -318,44 +318,44 @@
   (if (null places)
       `(progn ,@body)
       (let*/gensyms (environment)
-        (labels
-            ((more (places)
-               (let ((place (car places)))
-                 (with-gensyms (tmp valtmps valforms
-                                    newtmps setform getform)
-                   `((let ((,tmp ,(cadr place))
-                           (,(car place)
-                            (gensym ,(symbol-name (car place)))))
-                       (multiple-value-bind
-                           (,valtmps ,valforms
-                            ,newtmps ,setform ,getform)
-                           (get-setf-expansion ,tmp
-                                               ,environment)
-                         (list 'let*
-                               (mapcar #'list ,valtmps ,valforms)
-                               `(symbol-macrolet ((,,(car place)
-                                                   (%place-ref ,,getform
-                                                               ,,setform
-                                                               ,,newtmps)))
-                                  ,,@(if (cdr places)
-                                         (more (cdr places))
-                                         body))))))))))
-          (car (more (mapcar #'pairify (listify places))))))))
+	(labels
+	    ((more (places)
+	       (let ((place (car places)))
+		 (with-gensyms (tmp valtmps valforms
+				    newtmps setform getform)
+		   `((let ((,tmp ,(cadr place))
+			   (,(car place)
+			    (gensym ,(symbol-name (car place)))))
+		       (multiple-value-bind
+			   (,valtmps ,valforms
+			    ,newtmps ,setform ,getform)
+			   (get-setf-expansion ,tmp
+					       ,environment)
+			 (list 'let*
+			       (mapcar #'list ,valtmps ,valforms)
+			       `(symbol-macrolet ((,,(car place)
+						   (%place-ref ,,getform
+							       ,,setform
+							       ,,newtmps)))
+				  ,,@(if (cdr places)
+					 (more (cdr places))
+					 body))))))))))
+	  (car (more (mapcar #'pairify (listify places))))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Update-in-place macros built using with-places.
 
-(defmacro update-place (op place arg &environment env)
-  "Update PLACE with the value of OP PLACE ARG, returning the new value."
+(defmacro update-place (op place &rest args &environment env)
+  "Update PLACE with (OP PLACE . ARGS), returning the new value."
   (with-places (:environment env) (place)
-    `(setf ,place (,op ,place ,arg))))
+    `(setf ,place (,op ,place ,@args))))
 
-(defmacro update-place-after (op place arg &environment env)
-  "Update PLACE with the value of OP PLACE ARG, returning the old value."
+(defmacro update-place-after (op place &rest args &environment env)
+  "Update PLACE with (OP PLACE . ARGS), returning the old value."
   (with-places (:environment env) (place)
     (with-gensyms (x)
       `(let ((,x ,place))
-	 (setf ,place (,op ,x ,arg))
+	 (setf ,place (,op ,x ,@args))
 	 ,x))))
 
 (defmacro incf-after (place &optional (by 1))
@@ -385,7 +385,7 @@
       (get-setf-expansion place env)
     `(let* (,@(mapcar #'list valtmps valforms))
        (make-loc (lambda () ,getform)
-                 (lambda (,@newtmps) ,setform)))))
+		 (lambda (,@newtmps) ,setform)))))
 
 (declaim (inline loc (setf loc)))