Changeset 12805

Timestamp:

07/13/10 19:16:25 (13 years ago)

Author:

astalla

Message:

Fixed bugs with custom slot and class options

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (4 diffs)

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

@@ -210 +210 @@
              (push-on-end `(setf ,(cadr olist)) writers))
             (t
-       (push-on-end (car olist) non-std-options)
+       (push-on-end `(quote ,(car olist)) non-std-options)
              (push-on-end (cadr olist) non-std-options))))
-;     (error 'program-error
-;                    "invalid initialization argument ~S for slot named ~S"
-;                    (car olist) name))
         `(list
           :name ',name
@@ -260 +257 @@
     ((:documentation :report)
      (list (car option) `',(cadr option)))
-    (t (list (car option) `(quote ,(cdr option))))))
-;     (error 'program-error
-;            :format-control "invalid DEFCLASS option ~S"
-;            :format-arguments (list (car option))))))
+    (t (list `(quote ,(car option)) `(quote ,(cdr option))))))
 
 (defun make-initfunction (initform)
@@ -338 +332 @@
            (writers ())
            (allocation :instance)
-           (allocation-class nil)
-           &allow-other-keys)
+           (allocation-class nil))
   (setf (slot-definition-name slot) name)
   (setf (slot-definition-initargs slot) initargs)
@@ -2340 +2333 @@
   (declare (ignore name initargs initform initfunction readers writers allocation))
   ;;For built-in slots
-  (apply #'init-slot-definition slot args)
+  (apply #'init-slot-definition slot :allow-other-keys t args)
   ;;For user-defined slots
   (call-next-method))