infix: Replace multiple-value constructs with a single bind.

[lisp] / mdw-mop.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index 0766e38..dc5eb87 100644 (file)
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -27,15 +27,17 @@
 ;;; Packages.
 
 (defpackage #:mdw.mop
-  (:use #:common-lisp #+cmu #:pcl)
+  (:use #:common-lisp #:mdw.base #+cmu #:pcl)
   (:export #:compatible-class
+          #:copy-instance #:copy-instance-using-class
           #:initargs-for-effective-slot #:make-effective-slot
           #:filtered-slot-class-mixin
             #:filtered-direct-slot-definition
             #:filtered-effective-slot-definition
           #:predicate-class-mixin
           #:abstract-class-mixin #:instantiate-abstract-class
-          #:mdw-class #:abstract-class
+          #:singleton-class-mixin
+          #:mdw-class #:abstract-class #:singleton-class
           #:print-object-with-slots))
 
 (in-package #:mdw.mop)
@@ -63,6 +65,27 @@
   (eq (class-of sub) (find-class 'standard-class)))
 
 ;;;--------------------------------------------------------------------------
+;;; Copying instances.
+
+(defgeneric copy-instance-using-class (class object &rest initargs)
+  (:documentation
+   "Does the donkey-work behind copy-instance."))
+
+(defmethod copy-instance-using-class
+    ((class standard-class) object &rest initargs)
+  (let ((new (apply #'allocate-instance class initargs)))
+    (dolist (slot (class-slots class))
+      (setf (slot-value-using-class class new slot)
+           (slot-value-using-class class object slot)))
+    (apply #'shared-initialize new nil initargs)
+    new))
+
+(defun copy-instance (object &rest initargs)
+  "Make a copy of OBJECT, modifying it by setting slots as requested by
+   INITARGS."
+  (apply #'copy-instance-using-class (class-of object) object initargs))
+
+;;;--------------------------------------------------------------------------
 ;;; Utilities for messing with slot options.
 
 (defgeneric initargs-for-effective-slot (class direct-slots)
@@ -152,7 +175,7 @@
       (call-next-method)))
 
 (defmethod initialize-instance :after
-    ((slot filtered-direct-slot-definition) &key &allow-other-keys)
+    ((slot filtered-direct-slot-definition) &key)
   (with-slots (filter) slot
     (when (and (consp filter)
               (or (eq (car filter) 'function)
@@ -191,7 +214,7 @@
     returning a non-nil value."))
 
 (defmethod shared-initialize :after
-    ((class predicate-class-mixin) slot-names &key &allow-other-keys)
+    ((class predicate-class-mixin) slot-names &key)
   (declare (ignore slot-names))
   (with-slots (predicates) class
     (dolist (predicate predicates)
@@ -234,6 +257,22 @@
   (error 'instantiate-abstract-class :class class))
 
 ;;;--------------------------------------------------------------------------
+;;; Singleton classes.
+
+(defclass singleton-class-mixin (compatible-class)
+  ((instance :initform nil :type (or null standard-object)))
+  (:documentation
+   "A class which has only one instance.  All calls to `make-instance' return
+    the same object."))
+
+(defmethod allocate-instance ((class singleton-class-mixin) &key)
+  "If the class already has an instance, return it; otherwise allocate one,
+   store it away, and return that."
+  (with-slots (instance) class
+    (or instance
+       (setf instance (call-next-method)))))
+
+;;;--------------------------------------------------------------------------
 ;;; Useful classes.
 
 (defclass mdw-class (filtered-slot-class-mixin
@@ -247,6 +286,7 @@
     features."))
 
 (defclass abstract-class (mdw-class abstract-class-mixin) ())
+(defclass singleton-class (mdw-class singleton-class-mixin) ())
 
 ;;;--------------------------------------------------------------------------
 ;;; Printing things.
@@ -274,7 +314,7 @@
                 (progn (format stream " ~@_~:I") (setf sep t)))
             (let ((name (pprint-pop))
                   (value (pprint-pop)))
-              (format stream "~S ~@_~:[~S~;<unbound>~*~]"
+              (format stream "~S ~@_~:[~W~;#<unbound>~*~]"
                       name (eq value magic) value))))))))
 
 ;;;----- That's all, folks --------------------------------------------------