Changeset 11479

Timestamp:

Dec 8, 2008, 5:04:01 PM (12 years ago)

Author:

gz

Message:

Fix for default-initargs of NIL being ignored in optimized make-instance calls. While in there, don't need to use the init function for quoted default initargs

File:

• branches/working-0711/ccl/level-1/l1-clos.lisp (modified) (2 diffs)

branches/working-0711/ccl/level-1/l1-clos.lisp

@@ -2267 +2267 @@
                                                       initform
                                                       `(%slot-unbound-marker))))))
-                                      (default (assq initarg default-initargs)))
+                                      (default (assq initarg default-initargs))
+                                      (default-value-form nil))
                                  (when spvar (ignorable spvar))
                                  (when default
                                    (destructuring-bind (form function)
                                        (cdr default)
-                                     (setq default
-                                           (if (self-evaluating-p form)
+                                     (setq default-value-form
+                                           (if (or (quoted-form-p form)
+                                                   (self-evaluating-p form))
                                                form
                                                `(funcall ,function)))))
@@ -2279 +2281 @@
                                         (list initarg name)
                                         (if (and default one-initarg-p (null location-var))
-                                            default
+                                            default-value-form
                                             initial-value-form)
                                         (if spvar (list spvar))))