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 97075785ee569b5e695ae527ee5a7da7612021b3..77eca391e49ea79bbf09e7e14c684274273ac411 100644 (file)
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -297,17 +297,15 @@ (defmethod sod-message-effective-method-class
 (defmethod method-keyword-argument-lists
     ((method initialization-effective-method) direct-methods)
   (append (call-next-method)
 (defmethod method-keyword-argument-lists
     ((method initialization-effective-method) direct-methods)
   (append (call-next-method)

-         (delete-duplicates
-          (mapcan (lambda (class)
-                    (let ((initargs (sod-class-initargs class)))
-                      (and initargs
-                           (list (cons (mapcar #'sod-initarg-argument
-                                               initargs)
-                                       (format nil "initargs for ~A"
-                                               class))))))
-                  (sod-class-precedence-list
-                   (effective-method-class method)))
-          :key #'argument-name)))
+         (mapcan (lambda (class)
+                   (let ((initargs (sod-class-initargs class)))
+                     (and initargs
+                          (list (cons (format nil "initargs for ~A"
+                                              class)
+                                      (mapcar #'sod-initarg-argument
+                                              initargs))))))
+                 (sod-class-precedence-list
+                  (effective-method-class method)))))

 
 (defmethod lifecycle-method-kernel
     ((method initialization-effective-method) codegen target)
 
 (defmethod lifecycle-method-kernel
     ((method initialization-effective-method) codegen target)


@@ -541,11 +539,12 @@ (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*)

-(defvar *builtin-module* nil
+(defvar-unbound *builtin-module*

   "The builtin module.")
 
 (export 'make-builtin-module)
   "The builtin module.")
 
 (export 'make-builtin-module)


@@ -582,6 +581,6 @@ (defun make-builtin-module ()
     (setf *builtin-module* module)))
 
 (define-clear-the-decks builtin-module
     (setf *builtin-module* module)))
 
 (define-clear-the-decks builtin-module

-  (unless *builtin-module* (make-builtin-module)))
+  (unless (boundp '*builtin-module*) (make-builtin-module)))

 
 ;;;----- That's all, folks --------------------------------------------------
 
 ;;;----- That's all, folks --------------------------------------------------