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

[sod] / src / builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index c49f263e89ecd37d17950eae3fdbdb660619ea08..77eca391e49ea79bbf09e7e14c684274273ac411 100644 (file)
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -300,10 +300,10 @@ (defmethod method-keyword-argument-lists
          (mapcan (lambda (class)
                    (let ((initargs (sod-class-initargs class)))
                      (and initargs
          (mapcan (lambda (class)
                    (let ((initargs (sod-class-initargs class)))
                      (and initargs

-                          (list (cons (mapcar #'sod-initarg-argument
-                                              initargs)
-                                      (format nil "initargs for ~A"
-                                              class))))))
+                          (list (cons (format nil "initargs for ~A"
+                                              class)
+                                      (mapcar #'sod-initarg-argument
+                                              initargs))))))

                  (sod-class-precedence-list
                   (effective-method-class method)))))
 
                  (sod-class-precedence-list
                   (effective-method-class method)))))
 


@@ -539,7 +539,8 @@ (defun bootstrap-classes (module)
 
     ;; Done.
     (dolist (class classes)
 
     ;; Done.
     (dolist (class classes)

-      (finalize-sod-class class)
+      (unless (finalize-sod-class class)
+       (error "Failed to finalize built-in class"))

       (add-to-module module class))))
 
 (export '*builtin-module*)
       (add-to-module module class))))
 
 (export '*builtin-module*)