src/c-types-impl.lisp: Reorder `merge-keyword-lists' input lists.

[sod] / src / class-make-proto.lisp

diff --git a/src/class-make-proto.lisp b/src/class-make-proto.lisp
index d075304787914bd94055251078a470cb34c61013..0e3c5d74f2c91f245265a31c0f0c6177669171fa 100644 (file)
--- a/src/class-make-proto.lisp
+++ b/src/class-make-proto.lisp
@@ -46,12 +46,13 @@ (defun make-sod-class (name superclasses pset &optional location)
   (with-default-error-location (location)
     (let* ((pset (property-set pset))
           (best-class (or (get-property pset :lisp-metaclass :symbol nil)
   (with-default-error-location (location)
     (let* ((pset (property-set pset))
           (best-class (or (get-property pset :lisp-metaclass :symbol nil)

-                          (if superclasses
-                              (maximum (mapcar #'class-of superclasses)
-                                       #'subtypep
-                                       (format nil "Lisp metaclass for ~A"
-                                               name))
-                              'sod-class)))
+                          (select-minimal-class-property
+                           superclasses #'class-of #'subtypep 'sod-class
+                           "Lisp metaclass"
+                           :present (lambda (class)
+                                      (format nil "`~S'"
+                                              (class-name class)))
+                           :allow-empty t)))

           (class (make-instance best-class
                                 :name name
                                 :superclasses superclasses
           (class (make-instance best-class
                                 :name name
                                 :superclasses superclasses