doc/concepts.tex: Don't highlight `primary' as literal, because it's not.

[sod] / src / builtin.lisp

diff --git a/src/builtin.lisp b/src/builtin.lisp
index 7bb38e5..e4b42de 100644 (file)
--- a/src/builtin.lisp
+++ b/src/builtin.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -90,8 +90,8 @@
   (format nil "~A__imprint" class)
   (let ((ilayout (sod-class-ilayout class)))
     (format stream "~&~:
-/* Imprint raw memory with instance structure. */
-static void *~A__imprint(void *p)
+/* Imprint raw memory with class `~A' instance structure. */
+static void *~:*~A__imprint(void *p)
 {
   struct ~A *sod__obj = p;
 
@@ -140,20 +140,13 @@ static void *~A__init(void *p)~%{~%" class)
                               "  struct ~A *sod__obj = ~A__imprint(p);~2%"
                               (ilayout-struct-tag class) class)
                       (setf used t))
-                    (format stream "  {~%    ~A ~A ="
-                            (sod-slot-type dslot)
-                            *sod-tmp-val*)
-                    (ecase (sod-initializer-value-kind init)
-                      (:simple (write (sod-initializer-value-form init)
-                                      :stream stream
-                                      :pretty nil :escape nil)
-                               (format stream ";~%"))
-                      (:compound (format stream " {")
-                                 (write (sod-initializer-value-form init)
-                                        :stream stream
-                                        :pretty nil :escape nil)
-                                 (format stream "    };~%")))
-                    (format stream "    ~A.~A = ~A;~%  }~%"
+                    (format stream "  {~%    ")
+                    (pprint-c-type (sod-slot-type dslot) stream
+                                   *sod-tmp-val*)
+                    (format stream " = ~A;~%    ~
+                                      ~A.~A = ~A;~%  ~
+                                    }~%"
+                            (sod-initializer-value init)
                             isl (sod-slot-name dslot)
                             *sod-tmp-val*))))))))))
     (unless used
@@ -316,7 +309,7 @@ static const SodClass *const ~A__cpl[] = {
                                                    :case :common)
                               :state nil)))
     (with-module-environment (module)
-      (dolist (name '("va_list" "size_t" "ptrdiff_t"))
+      (dolist (name '("va_list" "size_t" "ptrdiff_t" "wchar_t"))
        (add-to-module module (make-instance 'type-item :name name)))
       (flet ((header-name (name)
               (concatenate 'string "\"" (string-downcase name) ".h\""))