X-Git-Url: https://git.distorted.org.uk/~mdw/lisp/blobdiff_plain/e96e008d5962bdbf73e16350a3880983857e87a4..4b6a6387f82f1bb2058d642dcbd7040ce2578cea:/mdw-mop.lisp

diff --git a/mdw-mop.lisp b/mdw-mop.lisp
index e8946e8..a669490 100644
--- a/mdw-mop.lisp
+++ b/mdw-mop.lisp
@@ -27,12 +27,14 @@
 ;;; 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
 	   #:print-object-with-slots))
@@ -62,6 +64,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)
@@ -151,7 +174,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)
@@ -172,10 +195,44 @@
      (class filtered-slot-class-mixin)
      (object standard-object)
      (slot filtered-effective-slot-definition))
-  (call-next-method (funcall (slot-definition-filter slot) object value)
+  (call-next-method (funcall (slot-definition-filter slot) value)
 		    class object slot))
 
 ;;;--------------------------------------------------------------------------
+;;; Predicates.
+
+(defclass predicate-class-mixin (compatible-class)
+  ((predicates :type list :initarg :predicate :initform nil
+	       :documentation "Predicate generic function to create."))
+  (:documentation
+   "Class which can automatically generate a predicate generic function.
+    Adds the `:predicate' class option, which takes a single symbol argument
+    FUNC.  If specified, and non-nil, a generic function FUNC with one
+    argument will be defined (if it doesn't already exist) with a default
+    method returning nil, and a method added specialized on this class
+    returning a non-nil value."))
+
+(defmethod shared-initialize :after
+    ((class predicate-class-mixin) slot-names &key)
+  (declare (ignore slot-names))
+  (with-slots (predicates) class
+    (dolist (predicate predicates)
+      (let ((lambda-list '(thing)))
+	(let ((gf (if (fboundp predicate)
+		      (fdefinition predicate)
+		      (let ((gf (ensure-generic-function
+				 predicate :lambda-list lambda-list)))
+			(add-method gf (make-instance
+					'standard-method
+					:specializers (list (find-class 't))
+					:lambda-list lambda-list
+					:function (constantly nil)))))))
+	  (add-method gf (make-instance 'standard-method
+					:specializers (list class)
+					:lambda-list lambda-list
+					:function (constantly t))))))))
+
+;;;--------------------------------------------------------------------------
 ;;; Abstract classes.
 
 (defclass abstract-class-mixin (compatible-class)
@@ -202,8 +259,14 @@
 ;;; Useful classes.
 
 (defclass mdw-class (filtered-slot-class-mixin
+		     predicate-class-mixin
 		     compatible-class)
-  ())
+  ()
+  (:documentation
+   "A generally useful metaclass with handy features.  If I've done the
+    hacking right, there shouldn't be a significant cost to using this
+    metaclass for all your classes if you don't use any of its fancy
+    features."))
 
 (defclass abstract-class (mdw-class abstract-class-mixin) ())
 
@@ -233,7 +296,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 --------------------------------------------------