X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fhost-c-call.lisp;h=7b558afcddda9d050fafc4fb2f97122c63a44e42;hb=0c3bbfaa2286626a2d915c8810f690aefc702661;hp=7d4c9d7eac5923ef438ac4eb7acc7193915a9942;hpb=8cad02355db787b9f077b77f508329550ccd0db6;p=sbcl.git

diff --git a/src/code/host-c-call.lisp b/src/code/host-c-call.lisp
index 7d4c9d7..7b558af 100644
--- a/src/code/host-c-call.lisp
+++ b/src/code/host-c-call.lisp
@@ -13,15 +13,18 @@
 
 (define-alien-type-class (c-string :include pointer :include-args (to))
   (external-format :default :type keyword)
-  (element-type 'character :type (member character base-char)))
+  (element-type 'character :type (member character base-char))
+  (not-null nil :type boolean))
 
 (define-alien-type-translator c-string
     (&key (external-format :default)
-          (element-type 'character))
+          (element-type 'character)
+          (not-null nil))
   (make-alien-c-string-type
    :to (parse-alien-type 'char (sb!kernel:make-null-lexenv))
    :element-type element-type
-   :external-format external-format))
+   :external-format external-format
+   :not-null not-null))
 
 (defun c-string-external-format (type)
   (let ((external-format (alien-c-string-type-external-format type)))
@@ -30,13 +33,25 @@
         external-format)))
 
 (define-alien-type-method (c-string :unparse) (type)
-  (list 'c-string
-        :external-format (alien-c-string-type-external-format type)
-        :element-type (alien-c-string-type-element-type type)))
+  (let* ((external-format (alien-c-string-type-external-format type))
+         (element-type (alien-c-string-type-element-type type))
+         (not-null (alien-c-string-type-not-null type))
+         (tail
+          (append (unless (eq :default external-format)
+                    (list :external-format external-format))
+                  (unless (eq 'character element-type)
+                    (list :element-type element-type))
+                  (when not-null
+                    (list :not-null t)))))
+    (if tail
+        (cons 'c-string tail)
+        'c-string)))
 
 (define-alien-type-method (c-string :lisp-rep) (type)
-  (declare (ignore type))
-  '(or simple-string null (alien (* char)) (simple-array (unsigned-byte 8))))
+  (let ((possibilities '(simple-string (alien (* char)) (simple-array (unsigned-byte 8)))))
+    (if (alien-c-string-type-not-null type)
+        `(or ,@possibilities)
+        `(or null ,@possibilities))))
 
 (define-alien-type-method (c-string :deport-pin-p) (type)
   (declare (ignore type))
@@ -44,6 +59,8 @@
 
 (defun c-string-needs-conversion-p (type)
   #+sb-xc-host
+  (declare (ignore type))
+  #+sb-xc-host
   t
   #-sb-xc-host
   (let ((external-format (sb!impl::get-external-format
@@ -53,15 +70,24 @@
                           ;; changes.
                           (alien-c-string-type-external-format type))))
     (not (and external-format
-              (or (eq (caar external-format) :ascii)
+              (or (eq (first (sb!impl::ef-names external-format)) :ascii)
                   ;; On non-SB-UNICODE all latin-1 codepoints will fit
                   ;; into a base-char, on SB-UNICODE they won't.
                   #!-sb-unicode
-                  (eq (caar external-format) :latin-1))))))
+                  (eq (first (sb!impl::ef-names external-format)) :latin-1))))))
+
+(declaim (ftype (sfunction (t) nil) null-error))
+(defun null-error (type)
+  (aver (alien-c-string-type-not-null type))
+  (error 'type-error
+         :expected-type `(alien ,(unparse-alien-type type))
+         :datum nil))
 
 (define-alien-type-method (c-string :naturalize-gen) (type alien)
   `(if (zerop (sap-int ,alien))
-       nil
+       ,(if (alien-c-string-type-not-null type)
+            `(null-error ',type)
+            nil)
        ;; Check whether we need to do a full external-format
        ;; conversion, or whether we can just do a cheap byte-by-byte
        ;; copy of the c-string data.
@@ -81,17 +107,22 @@
             `(%naturalize-c-string ,alien))))
 
 (define-alien-type-method (c-string :deport-gen) (type value)
-  (declare (ignore type))
   ;; This SAP taking is safe as DEPORT callers pin the VALUE when
   ;; necessary.
   `(etypecase ,value
-     (null (int-sap 0))
+     (null
+      ,(if (alien-c-string-type-not-null type)
+           `(null-error ',type)
+           `(int-sap 0)))
      ((alien (* char)) (alien-sap ,value))
      (vector (vector-sap ,value))))
 
 (define-alien-type-method (c-string :deport-alloc-gen) (type value)
   `(etypecase ,value
-     (null nil)
+     (null
+      ,(if (alien-c-string-type-not-null type)
+           `(null-error ',type)
+           nil))
      ((alien (* char)) ,value)
      (simple-base-string
       ,(if (c-string-needs-conversion-p type)