X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/blobdiff_plain/52a79ab8b310a785f2c2f1a11069f3a5ad53810c..refs/heads/buildable/master:/src/builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index 8b4407b..5aad5f5 100644
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -95,7 +95,7 @@ (define-class-slot "imprint" (class stream)
 {
   struct ~A *sod__obj = p;
 
-  ~:{sod__obj->~A.~A._vt = &~A;~:^~%  ~}
+  ~:{sod__obj->~A.~A._vt = &~A.~A;~:^~%  ~}
   return (p);
 }~2%"
 	    class
@@ -105,7 +105,8 @@ (define-class-slot "imprint" (class stream)
 			     (tail (ichain-tail ichain)))
 			(list (sod-class-nickname head)
 			      (sod-class-nickname tail)
-			      (vtable-name class head))))
+			      (vtable-name class head)
+			      (sod-class-nickname tail))))
 		    (ilayout-ichains ilayout)))))
 
 (define-class-slot "init" (class stream)
@@ -331,4 +332,7 @@ (defun make-builtin-module ()
       (bootstrap-classes module))
     (setf *builtin-module* module)))
 
+(define-clear-the-decks builtin-module
+  (unless *builtin-module* (make-builtin-module)))
+
 ;;;----- That's all, folks --------------------------------------------------