src/c-types-class-impl.lisp (find-sod-class): Improve error reporting.

The built-in simple type names are now properly baked in, in the
`*simple-type-map*' hash table, rather than being exported by the
`builtin' module, so check there before reporting a type as `unknown'.

diff --git a/src/c-types-class-impl.lisp b/src/c-types-class-impl.lisp
index 1f43c600530191732e6a3fadf4c5b5fb06035840..2908d754a5b2f48c687640203460d3b336bba94f 100644 (file)
--- a/src/c-types-class-impl.lisp
+++ b/src/c-types-class-impl.lisp
@@ -128,9 +128,13 @@ (define-c-type-syntax class (name &rest quals)
 (export 'find-sod-class)
 (defun find-sod-class (name)
   "Return the `sod-class' object with the given NAME."
 (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)
 
 (export 'record-sod-class)
 (defun record-sod-class (class)