X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fenv.lisp;h=d074eb63fa8c3ca83ea29596f4112444c4480901;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=6bed6ae41649d55c844dff206daa51306a27e7f6;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/pcl/env.lisp b/src/pcl/env.lisp
index 6bed6ae..d074eb6 100644
--- a/src/pcl/env.lisp
+++ b/src/pcl/env.lisp
@@ -125,10 +125,47 @@
 
 (defmethod make-load-form ((object wrapper) &optional env)
   (declare (ignore env))
-  (let ((pname (sb-kernel:classoid-proper-name
-		(sb-kernel:layout-classoid object))))
+  (let ((pname (classoid-proper-name
+		(layout-classoid object))))
     (unless pname
       (error "can't dump wrapper for anonymous class:~%  ~S"
-	     (sb-kernel:layout-classoid object)))
-    `(sb-kernel:classoid-layout (sb-kernel:find-classoid ',pname))))
+	     (layout-classoid object)))
+    `(classoid-layout (find-classoid ',pname))))
 
+(defmethod make-load-form ((object structure-object) &optional env)
+  (declare (ignore env))
+  (error "~@<don't know how to dump ~S (default ~S method called).~@>"
+	 object 'make-load-form))
+
+(defmethod make-load-form ((object standard-object) &optional env)
+  (declare (ignore env))
+  (error "~@<don't know how to dump ~S (default ~S method called).~@>"
+	 object 'make-load-form))
+
+(defmethod make-load-form ((object condition) &optional env)
+  (declare (ignore env))
+  (error "~@<don't know how to dump ~S (default ~S method called).~@>"
+	 object 'make-load-form))
+
+(defun make-load-form-saving-slots (object &key slot-names environment)
+  (declare (ignore environment))
+  (let ((class (class-of object)))
+    (collect ((inits))
+      (dolist (slot (class-slots class))
+        (let ((slot-name (slot-definition-name slot)))
+          (when (or (memq slot-name slot-names)
+                    (and (null slot-names)
+                         (eq :instance (slot-definition-allocation slot))))
+            (if (slot-boundp-using-class class object slot)
+                (let ((value (slot-value-using-class class object slot)))
+		  (if (typep object 'structure-object)
+		      ;; low-level but less noisy initializer form
+		      (let* ((dd (get-structure-dd (class-name class)))
+			     (dsd (find slot-name (dd-slots dd)
+					:key #'dsd-name)))
+			(inits `(,(slot-setter-lambda-form dd dsd)
+				 ',value ,object)))
+		      (inits `(setf (slot-value ,object ',slot-name) ',value))))
+                (inits `(slot-makunbound ,object ',slot-name))))))
+      (values `(allocate-instance (find-class ',(class-name class)))
+              `(progn ,@(inits))))))