[armedbear-cvs] r13896 - trunk/abcl/src/org/armedbear/lisp

[rschlatte at common-lisp.net]

Author: rschlatte
Date: Wed Mar 28 12:23:05 2012
New Revision: 13896

Log:
Call (setf slot-value-using-class) from (setf slot-value).

Modified:
   trunk/abcl/src/org/armedbear/lisp/clos.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/clos.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/clos.lisp	Wed Mar 28 12:11:51 2012	(r13895)
+++ trunk/abcl/src/org/armedbear/lisp/clos.lisp	Wed Mar 28 12:23:05 2012	(r13896)
@@ -695,10 +695,9 @@
 
 (defun %set-slot-value (object slot-name new-value)
   (if (or (eq (class-of (class-of object)) +the-standard-class+)
-	  (eq (class-of (class-of object)) +the-structure-class+))
+          (eq (class-of (class-of object)) +the-structure-class+))
       (setf (std-slot-value object slot-name) new-value)
-      (set-slot-value-using-class new-value (class-of object)
-                                  object slot-name)))
+      (setf (slot-value-using-class (class-of object) object slot-name) new-value)))
 
 (defsetf slot-value %set-slot-value)
 
@@ -3012,10 +3011,6 @@
 
 ;;; Slot access
 
-(defun set-slot-value-using-class (new-value class instance slot-name)
-  (declare (ignore class)) ; FIXME
-  (setf (std-slot-value instance slot-name) new-value))
-
 (defgeneric slot-value-using-class (class instance slot-name))
 
 (defmethod slot-value-using-class ((class standard-class) instance slot-name)