mdw-base: Update-in-place macros.

[lisp] / mdw-base.lisp

diff --git a/mdw-base.lisp b/mdw-base.lisp
index edebebb275e3b8a386f0e0e3217eb93122459a21..21948fa0311a5aa5a273621c172b03ff2445e36f 100644 (file)
--- a/mdw-base.lisp
+++ b/mdw-base.lisp
@@ -31,7 +31,9 @@ (defpackage #:mdw.base
           #:whitespace-char-p
           #:slot-uninitialized
           #:with-gensyms #:let*/gensyms #:with-places
           #:whitespace-char-p
           #:slot-uninitialized
           #:with-gensyms #:let*/gensyms #:with-places

-          #:locp #:locf #:ref #:with-locatives))
+          #:locp #:locf #:ref #:with-locatives
+          #:update-place #:update-place-after
+          #:incf-after #:decf-after))

 (in-package #:mdw.base)
 
 (defmacro compile-time-defun (name args &body body)
 (in-package #:mdw.base)
 
 (defmacro compile-time-defun (name args &body body)


@@ -173,6 +175,25 @@ (defmacro with-places ((&key environment) places &body body)
                                          body))))))))))
           (car (more (mapcar #'pairify (listify places))))))))
 
                                          body))))))))))
           (car (more (mapcar #'pairify (listify places))))))))
 

+(defmacro update-place (op place arg &environment env)
+  "Update PLACE with the value of OP PLACE ARG, returning the new value."
+  (with-places (:environment env) (place)
+    `(setf ,place (,op ,place ,arg))))
+(defmacro update-place-after (op place arg &environment env)
+  "Update PLACE with the value of OP PLACE ARG, returning the old value."
+  (with-places (:environment env) (place)
+    (with-gensyms (x)
+      `(let ((,x ,place))
+         (setf ,place (,op ,x ,arg))
+         ,x))))
+(defmacro incf-after (place &optional (by 1))
+  "Increment PLACE by BY, returning the old value."
+  `(update-place-after + ,place ,by))
+(defmacro decf-after (place &optional (by 1))
+  "Decrement PLACE by BY, returning the old value."
+  `(update-place-after - ,place ,by))
+
+

 (defstruct (loc (:predicate locp) (:constructor make-loc (reader writer)))
   "Locative data type.  See `locf' and `ref'."
   (reader (slot-uninitialized) :type function)
 (defstruct (loc (:predicate locp) (:constructor make-loc (reader writer)))
   "Locative data type.  See `locf' and `ref'."
   (reader (slot-uninitialized) :type function)