X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/3109662aca9c06495ac22c5c58b46e1c036aca5c..12949379840101e2d65883f29c5e8f0f6de49e9c:/src/c-types-class-impl.lisp

diff --git a/src/c-types-class-impl.lisp b/src/c-types-class-impl.lisp
index 34c7eeb..2908d75 100644
--- a/src/c-types-class-impl.lisp
+++ b/src/c-types-class-impl.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
@@ -30,8 +30,8 @@
 
 (export '(c-class-type c-type-class))
 (defclass c-class-type (simple-c-type)
-  ((class :initarg :class :initform nil
-	  :type (or null sod-class) :accessor c-type-class)
+  ((%class :initarg :class :initform nil
+	   :type (or null sod-class) :accessor c-type-class)
    (tag :initarg :tag))
   (:documentation
    "A SOD class, as a C type.
@@ -68,7 +68,7 @@
   (atypecase (gethash name *module-type-map*)
     (null nil)
     (c-class-type it)
-    (t (error "Type `~A' (~A) is not a class" name it))))
+    (t (error "Type `~A' is not a class" name))))
 
 (export 'make-class-type)
 (defun make-class-type (name &optional qualifiers)
@@ -91,6 +91,7 @@
 	   (values it (slot-value it 'tag))
 	   (let* ((tag (gensym "TAG-"))
 		  (type (intern-c-type 'c-class-type :name name :tag tag)))
+	     (setf (gethash name *module-type-map*) type)
 	     (values type tag)))
 
     ;; If no qualifiers are wanted then we've already found or created the
@@ -127,9 +128,13 @@
 (export 'find-sod-class)
 (defun find-sod-class (name)
   "Return the `sod-class' object with the given NAME."
-  (aif (find-class-type name)
-       (or (c-type-class it) (error "Class `~A' is incomplete" name))
-       (error "Type `~A' not known" name)))
+  (acond ((find-class-type name)
+	  (or (c-type-class it)
+	      (error "Class `~A' is incomplete" name)))
+	 ((find-simple-c-type name)
+	  (error "Type `~A' is not a class" name))
+	 (t
+	  (error "Type `~A' not known" name))))
 
 (export 'record-sod-class)
 (defun record-sod-class (class)