X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fdesignator.lisp;h=ef33e4005bbace0874fcdfc381c6a666df72e772;hb=06c288327bb8ea3a9534c63c0a8a909445a62054;hp=2aa33e276db5cd84d8250960fb42337351f54ec5;hpb=84500b84beb8a03298beaf731d36faee5323b4d5;p=sbcl.git

diff --git a/contrib/sb-posix/designator.lisp b/contrib/sb-posix/designator.lisp
index 2aa33e2..ef33e40 100644
--- a/contrib/sb-posix/designator.lisp
+++ b/contrib/sb-posix/designator.lisp
@@ -1,24 +1,26 @@
-(in-package :sb-posix-internal)
-(defmacro define-designator (name result &body conversions)
-  (let ((type `(quote (or ,@(mapcar #'car conversions))))
-	(typename (intern (format nil "~A-~A"
-				  (symbol-name name)
-				  (symbol-name :designator))
-			  #.*package*)))
+(in-package :sb-posix)
+(defvar *designator-types* (make-hash-table :test #'equal))
+
+(defmacro define-designator (name (lisp-type alien-type) doc
+                             &body conversions)
+  (let ((designator-type `(or ,@(mapcar #'car conversions)))
+        (designator-name (intern (format nil "~A-~A"
+                                         (symbol-name name)
+                                  (symbol-name :designator))
+                                 #.*package*))
+        (name (intern (symbol-name name) :sb-posix)))
     `(progn
+       (deftype ,name ()
+         ,@(when doc (list (first doc)))
+         ',lisp-type)
+       (deftype ,designator-name ()
+         ,@(when doc (list (second doc)))
+         ',designator-type)
       (eval-when (:compile-toplevel :load-toplevel :execute)
-	(deftype ,typename () ,type)
-	(setf (get ',name 'designator-type) ',result))
-      (defun ,(intern (symbol-name name) :sb-posix) (,name)
-	(declare (type ,typename ,name))
-	(etypecase ,name
-	  ,@conversions)))))
-
-(define-designator filename c-string
-  (pathname  (namestring (translate-logical-pathname filename)))
-  (string filename))
-
-(define-designator file-descriptor (integer 32)
-  (sb-impl::file-stream (sb-impl::fd-stream-fd file-descriptor))
-  (fixnum file-descriptor))
+        (setf (gethash ',name *designator-types*) ',alien-type))
+      (declaim (ftype (function (t) (values ,lisp-type &optional)) ,name))
+      (defun ,name (,name)
+        ,@(when doc (list (third doc)))
+        (etypecase ,name
+          ,@conversions)))))