Simplify the type handling API.

darcs-hash:9e2c0c2caf9589869f7894c3522a776748df38fd

2 files changed, 19 insertions, 13 deletions

diff --git a/Lisp/method-invocation.lisp b/Lisp/method-invocation.lisp
index c0e44ac..2389a9f 100644
--- a/Lisp/method-invocation.lisp
+++ b/Lisp/method-invocation.lisp
@@ -309,12 +309,12 @@ easier to use with __apply__.
 
 
 (defun typespec->c-type (typespec)
-  (case (car typespec)
+  (case (typespec-primary-type typespec)
     ((:pointer pointer struct union id objective-c-class exception array
       selector)
      :pointer)
     ((:string) :string)
-    (otherwise (car typespec))))
+    (otherwise (typespec-primary-type typespec))))
 
 
 (defun low-level-invoke (receiver selector return-typestring return-type
@@ -428,22 +428,15 @@ easier to use with __apply__.
                                             objc-arg-ptrs)))
             (unless (cffi:null-pointer-p error-cell)
               (error (make-condition 'exception :pointer error-cell)))
-            (case (let ((nominal-type (find-if #'(lambda (x)
-                                                   (and (consp x)
-                                                        (eq (car x) 'nominally)))
-                                               (cadr return-type))))
-                    ;; Do the modifiers include something like
-                    ;; (NOMINALLY :UNSIGNED-CHAR)?
-                    (if nominal-type
-                        (cadr nominal-type)
-                        (car return-type)))
+            (case (or (typespec-nominal-type return-type)
+                      (typespec-primary-type return-type))
               ((id objective-c-class exception selector)
                (let ((*skip-retaining*
                       (or *skip-retaining*
                           (constructor-name-p (selector-name selector)))))
                  (make-pointer-wrapper (car return-type)
-                    :pointer (cffi:mem-ref objc-return-value-cell
-                                           return-c-type))))
+                                       :pointer (cffi:mem-ref objc-return-value-cell
+                                                              return-c-type))))
               ((:char :unsigned-char)
                ;; FIXME: This is non-trivial.  See policy.lisp for
                ;; details.
diff --git a/Lisp/type-handling.lisp b/Lisp/type-handling.lisp
index b8ff2a2..1a299b6 100644
--- a/Lisp/type-handling.lisp
+++ b/Lisp/type-handling.lisp
@@ -288,3 +288,16 @@ Returns: (VALUES typespec byte-position string-position)"
       (t (format stream "~A" (typespec-name->type-id type-name))
          (dolist (child rest)
            (print-typespec child stream))))))
+
+
+(defun typespec-nominal-type (typespec)
+  ;; Do the modifiers include something like (NOMINALLY :UNSIGNED-CHAR)?
+  ;; Return NIL if that is not the case, otherwise return the nominal
+  ;; type found.
+  (cadr (find-if #'(lambda (x) (and (consp x)
+                                    (eq (car x) 'nominally)))
+                 (cadr typespec))))
+
+
+(defun typespec-primary-type (typespec)
+  (car typespec))