X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/4b64aeef18655c33e033e9e0eadf939f51581d5e..01778b39c53316dda3f757c49276d034039ee9cb:/src/builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index c49f263..77eca39 100644
--- 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
-			   (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)))))
 
@@ -539,7 +539,8 @@ (defun bootstrap-classes (module)
 
     ;; 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*)