X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/310da1d592f5c9d2f906e1c6defb9ef8747c7a11..f40eddb4694b042c06cae8971e68299034f38384:/glib/ffi.lisp

diff --git a/glib/ffi.lisp b/glib/ffi.lisp
index 6fe93a5..6dc6a16 100644
--- a/glib/ffi.lisp
+++ b/glib/ffi.lisp
@@ -1,236 +1,29 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: ffi.lisp,v 1.1 2004-10-27 14:46:01 espen Exp $
+;; $Id: ffi.lisp,v 1.24 2006-02-19 19:17:45 espen Exp $
 
 (in-package "GLIB")
 
-;;;; Type methods
-
-(defvar *type-methods* (make-hash-table))
-
-(defun ensure-type-method-fun (fname)
-  (unless (fboundp fname)
-    (setf
-     (symbol-function fname)
-     #'(lambda (type-spec &rest args)
-	 (apply
-	  (find-applicable-type-method type-spec fname) type-spec args)))))
-
-(defmacro define-type-method-fun (fname lambda-list)
-  (declare (ignore lambda-list))
-  `(defun ,fname (type-spec &rest args)
-     (apply
-      (find-applicable-type-method type-spec ',fname) type-spec args)))
-
-
-(defun ensure-type-name (type)
-  (etypecase type
-    (symbol type)
-    (pcl::class (class-name type))))
-
-(defun add-type-method (type fname function)
-  (push
-   (cons fname function)
-   (gethash (ensure-type-name type) *type-methods*)))
-
-(defun find-type-method (type fname)
-  (cdr (assoc fname (gethash (ensure-type-name type) *type-methods*))))
-
-(defun find-applicable-type-method (type-spec fname &optional (error t))
-  (flet ((find-superclass-method (class)
-	   (when (and class (class-finalized-p class))
-;  	     (unless (class-finalized-p class)
-;	       (finalize-inheritance class))
-	     (dolist (super (cdr (pcl::class-precedence-list class)))
-	       (return-if (find-type-method super fname)))))
-	 (find-expanded-type-method (type-spec)
-	   (multiple-value-bind (expanded-type-spec expanded-p)
-	       (type-expand-1 type-spec)
-	     (cond
-	      (expanded-p 
-	       (find-applicable-type-method expanded-type-spec fname nil))
-	      ((neq type-spec t)
-	       (find-applicable-type-method t fname nil))))))
-
-    (or
-     (typecase type-spec
-       (pcl::class
-	(or
-	 (find-type-method type-spec fname)
-	 (find-superclass-method type-spec)))
-       (symbol
-	(or
-	 (find-type-method type-spec fname)
-	 (find-expanded-type-method type-spec)
-	 (find-superclass-method (find-class type-spec nil))))
-       (cons
-	(or
-	 (find-type-method (first type-spec) fname)
-	 (find-expanded-type-method type-spec)))
-       (t
-	(error "Invalid type specifier ~A" type-spec)))
-     (and
-      error
-      (error
-       "No applicable method for ~A when called with type specifier ~A"
-       fname type-spec)))))
-
-(defmacro deftype-method (fname type lambda-list &body body)
-  `(progn
-     (ensure-type-method-fun ',fname)
-     (add-type-method ',type ',fname #'(lambda ,lambda-list ,@body))
-     ',fname))
-  
-;; To make the compiler happy
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (define-type-method-fun translate-type-spec (type-spec))
-  (define-type-method-fun size-of (type-spec))
-  (define-type-method-fun translate-to-alien (type-spec expr &optional weak-ref))
-  (define-type-method-fun translate-from-alien (type-spec expr &optional weak-ref))
-  (define-type-method-fun cleanup-alien (type-spec sap &otional weak-ref))
-  (define-type-method-fun unreference-alien (type-spec sap)))
-
-
-;;;; 
-
-(defvar *type-function-cache* (make-hash-table :test #'equal))
-
-(defun get-cached-function (type-spec fname)
-  (cdr (assoc fname (gethash type-spec *type-function-cache*))))
-
-(defun set-cached-function (type-spec fname function)
-  (push (cons fname function) (gethash type-spec *type-function-cache*))
-  function)
-  
-
-(defun intern-argument-translator (type-spec)
-  (or
-   (get-cached-function type-spec 'argument-translator)
-   (set-cached-function type-spec 'argument-translator
-    (compile
-     nil
-     `(lambda (object)
-	(declare (ignorable object))
-	,(translate-to-alien type-spec 'object t))))))
-
-(defun intern-return-value-translator (type-spec)
-  (or
-   (get-cached-function type-spec 'return-value-translator)
-   (set-cached-function type-spec 'return-value-translator
-    (compile
-     nil
-     `(lambda (alien)
-	(declare (ignorable alien))
-	,(translate-from-alien type-spec 'alien nil))))))
-
-(defun intern-cleanup-function (type-spec)
-  (or
-   (get-cached-function type-spec 'cleanup-function)
-   (set-cached-function type-spec 'cleanup-function
-    (compile
-     nil
-     `(lambda (alien)
-	(declare (ignorable alien))
-	,(cleanup-alien type-spec 'alien t))))))
-
-
-
-;; Returns a function to write an object of the specified type
-;; to a memory location
-(defun intern-writer-function (type-spec)
-  (or
-   (get-cached-function type-spec 'writer-function)
-   (set-cached-function type-spec 'writer-function
-    (compile
-     nil
-     `(lambda (value sap offset)
-	(declare (ignorable value sap offset))
-	(setf
-	 (,(sap-ref-fname type-spec) sap offset)
-	 ,(translate-to-alien type-spec 'value nil)))))))
-
-;; Returns a function to read an object of the specified type
-;; from a memory location
-(defun intern-reader-function (type-spec)
-  (or
-   (get-cached-function type-spec 'reader-function)
-   (set-cached-function type-spec 'reader-function
-    (compile
-     nil
-     `(lambda (sap offset)	 
-	(declare (ignorable sap offset))
-	,(translate-from-alien
-	  type-spec `(,(sap-ref-fname type-spec) sap offset) t))))))
-
-(defun intern-destroy-function (type-spec)
-  (if (atomic-type-p type-spec)
-      #'(lambda (sap offset)	 
-	  (declare (ignore sap offset)))
-    (or
-     (get-cached-function type-spec 'destroy-function)
-     (set-cached-function type-spec 'destroy-function
-       (compile
-	nil
-	`(lambda (sap offset)	 
-	   (declare (ignorable sap offset))
-	   ,(unreference-alien
-	     type-spec `(,(sap-ref-fname type-spec) sap offset))))))))
-
-
-
-;;;;
-
-(defconstant +bits-per-unit+ 8
-  "Number of bits in an addressable unit (byte)")
-
-;; Sizes of fundamental C types in addressable units
-(defconstant +size-of-short+ 2)
-(defconstant +size-of-int+ 4)
-(defconstant +size-of-long+ 4)
-(defconstant +size-of-sap+ 4)
-(defconstant +size-of-float+ 4)
-(defconstant +size-of-double+ 8)
-
-(defun sap-ref-unsigned (sap offset)
-  (sap-ref-32 sap offset))
-
-(defun sap-ref-signed (sap offset)
-  (signed-sap-ref-32 sap offset))
-
-(defun sap-ref-fname (type-spec)
-  (let ((alien-type-spec (mklist (translate-type-spec type-spec))))
-    (ecase (first alien-type-spec)
-      (unsigned
-       (ecase (second alien-type-spec)
-	 (8 'sap-ref-8)
-	 (16 'sap-ref-16)
-	 (32 'sap-ref-32)
-	 (64 'sap-ref-64)))
-      (signed
-       (ecase (second alien-type-spec)
-	 (8 'signed-sap-ref-8)
-	 (16 'signed-sap-ref-16)
-	 (32 'signed-sap-ref-32)
-	 (64 'signed-sap-ref-64)))
-      (system-area-pointer 'sap-ref-sap)
-      (single-float 'sap-ref-single)
-      (double-float 'sap-ref-double))))
-
 
 ;;;; Foreign function call interface
 
@@ -259,15 +52,22 @@
 
 
 (defun default-alien-fname (lisp-name)
-  (let* ((lisp-name-string
-	  (if (char= (char (the simple-string (string lisp-name)) 0) #\%)
-	      (subseq (the simple-string (string lisp-name)) 1)
-	    (string lisp-name)))
-	 (prefix (package-prefix *package*))
-	 (name (substitute #\_ #\- (string-downcase lisp-name-string))))
+  (let* ((name (substitute #\_ #\- (string-downcase lisp-name)))
+	 (stripped-name
+	  (cond
+	   ((and 
+	     (char= (char name 0) #\%)
+	     (string= "_p" name :start2 (- (length name) 2)))
+	    (subseq name 1 (- (length name) 2)))
+	   ((char= (char name 0) #\%)
+	    (subseq name 1))
+	   ((string= "_p" name :start2 (- (length name) 2))
+	    (subseq name 0 (- (length name) 2)))
+	   (name)))
+	 (prefix (package-prefix *package*)))
     (if (or (not prefix) (string= prefix ""))
-	name
-      (format nil "~A_~A" prefix name))))
+	stripped-name
+      (format nil "~A_~A" prefix stripped-name))))
 
 (defun default-alien-type-name (type-name)
   (let ((prefix (package-prefix *package*)))
@@ -288,7 +88,7 @@
       (rest parts) #\-) (find-prefix-package (first parts)))))
     
 	 
-(defmacro defbinding (name lambda-list return-type-spec &rest docs/args)
+(defmacro defbinding (name lambda-list return-type &rest docs/args)
   (multiple-value-bind (lisp-name c-name)
       (if (atom name)
  	  (values name (default-alien-fname name))
@@ -302,461 +102,870 @@
 	    (push doc/arg docs)
 	  (progn
 	    (destructuring-bind (expr type &optional (style :in)) doc/arg
-	      (unless (member style '(:in :out :in-out))
+	      (unless (member style '(:in :out :in-out :return))
 		(error "Bogus argument style ~S in ~S." style doc/arg))
 	      (when (and
 		     (not supplied-lambda-list)
-		     (namep expr) (member style '(:in :in-out)))
+		     (namep expr) (member style '(:in :in-out :return)))
 		(push expr lambda-list))
-	      (push
-	       (list (if (namep expr) (make-symbol (string expr)) (gensym)) expr type style) args)))))
+	      (push (list (cond 
+			   ((and (namep expr) (eq style :out)) expr)
+			   ((namep expr) (make-symbol (string expr)))
+			   ((gensym)))
+			  expr (mklist type) style) args)))))
       
       (%defbinding
        c-name lisp-name (or supplied-lambda-list (nreverse lambda-list))
-       return-type-spec (reverse docs) (reverse args)))))
+       return-type (reverse docs) (reverse args)))))
 
-#+cmu
-(defun %defbinding (foreign-name lisp-name lambda-list
-		    return-type-spec docs args)
-  (ext:collect ((alien-types) (alien-bindings) (alien-parameters)
-		(alien-values) (alien-deallocators))
+#+(or cmu sbcl)
+(defun %defbinding (foreign-name lisp-name lambda-list return-type docs args)
+  (collect ((alien-types) (alien-bindings) (alien-parameters) 
+	    (return-values) (cleanup-forms))
     (dolist (arg args)
-      (destructuring-bind (var expr type-spec style) arg
-	(let ((declaration (translate-type-spec type-spec))
-	      (deallocation (cleanup-alien type-spec var t)))
+      (destructuring-bind (var expr type style) arg
+	(let ((declaration (alien-type type))
+	      (cleanup (cleanup-form var type)))
+
 	  (cond
-	   ((member style '(:out :in-out))
-	    (alien-types `(* ,declaration))
-	    (alien-parameters `(addr ,var))
-	    (alien-bindings
-	     `(,var ,declaration
-	       ,@(when (eq style :in-out)
-		   (list (translate-to-alien type-spec expr t)))))
-	    (alien-values (translate-from-alien type-spec var nil)))
-	  (deallocation
-	   (alien-types declaration)
-	   (alien-bindings
-	    `(,var ,declaration ,(translate-to-alien type-spec expr t)))
-	   (alien-parameters var)
-	   (alien-deallocators deallocation))
-	  (t
-	   (alien-types declaration)
-	   (alien-parameters (translate-to-alien type-spec expr t)))))))
+	    ((member style '(:out :in-out))
+	     (alien-types `(* ,declaration))
+	     (alien-parameters `(addr ,var))
+	     (alien-bindings
+	      `(,var ,declaration
+		,@(cond 
+		   ((eq style :in-out) (list (to-alien-form expr type)))
+		   ((eq declaration 'system-area-pointer) 
+		    (list '(make-pointer 0))))))
+	     (return-values (from-alien-form var type)))
+	    ((eq style :return)
+	     (alien-types declaration)
+	     (alien-bindings
+	      `(,var ,declaration ,(to-alien-form expr type)))
+	     (alien-parameters var)
+	     (return-values (from-alien-form var type)))
+	    (cleanup
+	     (alien-types declaration)
+	     (alien-bindings
+	      `(,var ,declaration ,(to-alien-form expr type)))
+	     (alien-parameters var)
+	     (cleanup-forms cleanup))
+	    (t
+	     (alien-types declaration)
+	     (alien-parameters (to-alien-form expr type)))))))
 
     (let* ((alien-name (make-symbol (string lisp-name)))
 	   (alien-funcall `(alien-funcall ,alien-name ,@(alien-parameters))))
       `(defun ,lisp-name ,lambda-list
 	 ,@docs
-	 (declare (optimize (ext:inhibit-warnings 3)))
+	 #+cmu(declare (optimize (inhibit-warnings 3)))
+	 #+sbcl(declare (muffle-conditions compiler-note))
 	 (with-alien ((,alien-name
 		       (function
-			,(translate-type-spec return-type-spec)
+			,(alien-type return-type)
 			,@(alien-types))
 		       :extern ,foreign-name)
 		      ,@(alien-bindings))
-	   ,(if return-type-spec
-		`(let ((result
-			,(translate-from-alien return-type-spec alien-funcall nil)))
-		   ,@(alien-deallocators)
-		   (values result ,@(alien-values)))
+	   ,(if return-type
+		`(values
+		  (unwind-protect 
+		      ,(from-alien-form alien-funcall return-type)
+		    ,@(cleanup-forms))
+		  ,@(return-values))
 	      `(progn
-		 ,alien-funcall
-		 ,@(alien-deallocators)
-		 (values ,@(alien-values)))))))))
+		(unwind-protect 
+		     ,alien-funcall
+		  ,@(cleanup-forms))
+		(values ,@(return-values)))))))))
 
 
+;;; Creates bindings at runtime
 (defun mkbinding (name return-type &rest arg-types)
-   (declare (optimize (ext:inhibit-warnings 3)))
-   (let* ((ftype
-	   `(function
-	     ,@(mapcar #'translate-type-spec (cons return-type arg-types))))
+  #+cmu(declare (optimize (inhibit-warnings 3)))
+  #+sbcl(declare (muffle-conditions compiler-note))
+  (let* ((ftype 
+	  `(function ,@(mapcar #'alien-type (cons return-type arg-types))))
 	 (alien
-	  (alien::%heap-alien
-	   (alien::make-heap-alien-info
-	    :type (alien::parse-alien-type ftype)
-	    :sap-form (system:foreign-symbol-address name :flavor :code))))
-	 (translate-arguments
-	  (mapcar #'intern-argument-translator arg-types))
-	 (translate-return-value (intern-return-value-translator return-type))
-	 (cleanup-arguments (mapcar #'intern-cleanup-function arg-types)))
-	 
+	  (%heap-alien
+	   (make-heap-alien-info
+	    :type (parse-alien-type ftype #+sbcl nil)
+	    :sap-form (let ((address (foreign-symbol-address name)))
+			(etypecase address
+			  (integer (int-sap address))
+			  (system-area-pointer address))))))
+	 (translate-arguments (mapcar #'to-alien-function arg-types))
+	 (translate-return-value (from-alien-function return-type))
+	 (cleanup-arguments (mapcar #'cleanup-function arg-types)))
+        
     #'(lambda (&rest args)
 	(map-into args #'funcall translate-arguments args)
 	(prog1
-	    (funcall
-	     translate-return-value (apply #'alien:alien-funcall alien args))
+	    (funcall translate-return-value 
+	     (apply #'alien-funcall alien args))
 	  (mapc #'funcall cleanup-arguments args)))))
 
 
-(defun type-translateable-p (type-spec)
-  (find-applicable-type-method type-spec 'translate-type-spec nil))
 
-(defun every-type-translateable-p (type-specs)
-  (every #'type-translateable-p type-specs))
+;;;; C callbacks
+
+(defmacro define-callback (name return-type args &body body)
+  (let ((define-callback 
+	  #+cmu'alien:def-callback 	              
+	  #+(and sbcl alien-callbacks)'sb-alien::define-alien-callback
+	  #+(and sbcl (not alien-callbacks))'sb-alien:define-alien-function))
+    (multiple-value-bind (doc declaration body)
+	(cond
+	 ((and (stringp (first body)) (eq (cadr body) 'declare))
+	  (values (first body) (second body) (cddr body)))
+	 ((stringp (first body))
+	  (values (first body) nil (rest body)))
+	 ((eq (caar body) 'declare)
+	  (values nil (first body) (rest body)))
+	 (t (values nil nil body)))
+      `(,define-callback ,name 
+	 #+(and sbcl alien-callbacks),(alien-type return-type) 
+         (#+(or cmu (and sbcl (not alien-callbacks))),(alien-type return-type)
+	 ,@(mapcar #'(lambda (arg)
+		       (destructuring-bind (name type) arg
+			 `(,name ,(alien-type type))))
+		   args))
+	 ,@(when doc (list doc))
+	 ,(to-alien-form 
+	   `(let (,@(loop
+		     for (name type) in args
+		     as from-alien-form = (callback-from-alien-form name type)
+		     collect `(,name ,from-alien-form)))
+	      ,@(when declaration (list declaration))
+	      (unwind-protect
+		  (progn ,@body)	      
+ 	      ,@(loop 
+ 		 for (name type) in args
+ 		 do (callback-cleanup-form name type))))
+
+	 return-type)))))
+
+(defun callback-address (callback)
+  #+cmu(alien::callback-trampoline callback)
+  #+(and sbcl (not alien-callbacks))(sb-alien:alien-function-sap callback)
+  #+(and sbcl alien-callbacks)(sb-alien:alien-sap callback))
+
+#+sbcl
+(deftype callback () 
+  #-alien-callbacks'sb-alien:alien-function
+  #+alien-callbacks'sb-alien:alien)
+
+
+;;; These are for backward compatibility
+
+(defmacro defcallback (name (return-type &rest args) &body body)
+  `(define-callback ,name ,return-type ,args ,@body))
+
+#-cmu
+(defun callback (callback)
+  (callback-address callback))
 
-(defun mkbinding-late (name return-type &rest arg-types)
-  (if (every-type-translateable-p (cons return-type arg-types))
-      (apply #'mkbinding name return-type arg-types)
-    (let ((binding nil))
-      #'(lambda (&rest args)
-	  (cond
-	   (binding (apply binding args))
-	   ((every-type-translateable-p (cons return-type arg-types))
-	    (setq binding (apply #'mkbinding name return-type arg-types))
-	    (apply binding args))
-	   (t
-	    (dolist (type-spec (cons return-type arg-types))
-	      (unless (type-translateable-p type-spec)
-		(error "Can't translate type ~A" type-spec)))))))))
 
-  
 
 ;;;; Definitons and translations of fundamental types
 
-(deftype long (&optional (min '*) (max '*)) `(integer ,min ,max))
-(deftype unsigned-long (&optional (min '*) (max '*)) `(integer ,min ,max))
-(deftype int (&optional (min '*) (max '*)) `(long ,min ,max))
-(deftype unsigned-int (&optional (min '*) (max '*)) `(unsigned-long ,min ,max))
-(deftype short (&optional (min '*) (max '*)) `(int ,min ,max))
-(deftype unsigned-short (&optional (min '*) (max '*)) `(unsigned-int ,min ,max))
-(deftype signed (&optional (size '*)) `(signed-byte ,size))
-(deftype unsigned (&optional (size '*)) `(signed-byte ,size))
-(deftype char () 'base-char)
-(deftype pointer () 'system-area-pointer)
-(deftype boolean (&optional (size '*))
-  (declare (ignore size))
-  `(member t nil))
-(deftype invalid () nil)
-
-(defun atomic-type-p (type-spec)
-  (or
-   (eq type-spec 'pointer)
-   (not (eq (translate-type-spec type-spec) 'system-area-pointer))))
+(defmacro def-type-method (name args &optional documentation)
+  `(progn
+    (defgeneric ,name (,@args type &rest args)
+      ,@(when documentation `((:documentation ,documentation))))
+    (defmethod ,name (,@args (type symbol) &rest args)
+      (let ((class (find-class type nil)))
+	(if class 
+	    (apply #',name ,@args class args)
+	  (multiple-value-bind (super-type expanded-p)
+	      (type-expand-1 (cons type args))
+	    (if expanded-p
+		(,name ,@args super-type)
+	      (call-next-method))))))
+    (defmethod ,name (,@args (type cons) &rest args)
+      (declare (ignore args))
+      (apply #',name ,@args (first type) (rest type)))))
+    
 
+(def-type-method alien-type ())
+(def-type-method size-of ())
+(def-type-method to-alien-form (form))
+(def-type-method from-alien-form (form))
+(def-type-method cleanup-form (form)
+  "Creates a form to clean up after the alien call has finished.")
+(def-type-method callback-from-alien-form (form))
+(def-type-method callback-cleanup-form (form))
 
-(deftype-method cleanup-alien t (type-spec sap &optional weak-ref)
-  (declare (ignore type-spec sap weak-ref))
-  nil)
+(def-type-method to-alien-function ())
+(def-type-method from-alien-function ())
+(def-type-method cleanup-function ())
 
+(def-type-method copy-to-alien-form (form))
+(def-type-method copy-to-alien-function ())
+(def-type-method copy-from-alien-form (form))
+(def-type-method copy-from-alien-function ())
 
-(deftype-method translate-to-alien integer (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(def-type-method writer-function ())
+(def-type-method reader-function ())
+(def-type-method destroy-function ())
 
-(deftype-method translate-from-alien integer (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(def-type-method unbound-value ()
+  "First return value is true if the type has an unbound value, second return value is the actual unbound value")
 
 
-(deftype-method translate-type-spec fixnum (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'signed))
+;; Sizes of fundamental C types in bytes (8 bits)
+(defconstant +size-of-short+ 2)
+(defconstant +size-of-int+ 4)
+(defconstant +size-of-long+ 4)
+(defconstant +size-of-pointer+ 4)
+(defconstant +size-of-float+ 4)
+(defconstant +size-of-double+ 8)
 
-(deftype-method size-of fixnum (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'signed))
+;; Sizes of fundamental C types in bits
+(defconstant +bits-of-byte+ 8)
+(defconstant +bits-of-short+ 16)
+(defconstant +bits-of-int+ 32)
+(defconstant +bits-of-long+ 32)
 
-(deftype-method translate-to-alien fixnum (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
 
-(deftype-method translate-from-alien fixnum (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(deftype int () '(signed-byte #.+bits-of-int+))
+(deftype unsigned-int () '(unsigned-byte #.+bits-of-int+))
+(deftype long () '(signed-byte #.+bits-of-long+))
+(deftype unsigned-long () '(unsigned-byte #.+bits-of-long+))
+(deftype short () '(signed-byte #.+bits-of-short+))
+(deftype unsigned-short () '(unsigned-byte #.+bits-of-short+))
+(deftype signed (&optional (size '*)) `(signed-byte ,size))
+(deftype unsigned (&optional (size '*)) `(unsigned-byte ,size))
+(deftype char () 'base-char)
+(deftype pointer () 'system-area-pointer)
+(deftype boolean (&optional (size '*)) (declare (ignore size)) `(member t nil))
+;(deftype invalid () nil)
 
 
-(deftype-method translate-type-spec long (type-spec)
-  (declare (ignore type-spec))
-  `(signed ,(* +bits-per-unit+ +size-of-long+)))
+(defmethod to-alien-form (form (type t) &rest args)
+  (declare (ignore type args))
+  form)
 
-(deftype-method size-of long (type-spec)
-  (declare (ignore type-spec))
-  +size-of-long+)
+(defmethod to-alien-function ((type t) &rest args)
+  (declare (ignore type args))
+  #'identity)
 
+(defmethod from-alien-form (form (type t) &rest args)
+  (declare (ignore type args))
+  form)
 
-(deftype-method translate-type-spec unsigned-long (type-spec)
-  (declare (ignore type-spec))
-  `(unsigned ,(* +bits-per-unit+ +size-of-long+)))
+(defmethod from-alien-function ((type t) &rest args)
+  (declare (ignore type args))
+  #'identity)
+ 
+(defmethod cleanup-form (form (type t) &rest args)
+  (declare (ignore form type args))
+  nil)
 
-(deftype-method size-of unsigned-long (type-spec)
-  (declare (ignore type-spec))
-  +size-of-long+)
+(defmethod cleanup-function ((type t) &rest args)
+  (declare (ignore type args))
+  #'identity)
 
+(defmethod callback-from-alien-form (form (type t) &rest args)
+  (apply #'copy-from-alien-form form type args))
 
-(deftype-method translate-type-spec int (type-spec)
-  (declare (ignore type-spec))
-  `(signed ,(* +bits-per-unit+ +size-of-int+)))
+(defmethod callback-cleanup-form (form (type t) &rest args)
+  (declare (ignore form type args))
+  nil)
 
-(deftype-method size-of int (type-spec)
-  (declare (ignore type-spec))
-  +size-of-int+)
+(defmethod destroy-function ((type t) &rest args)
+  (declare (ignore type args))
+  #'(lambda (location &optional offset)
+      (declare (ignore location offset))))
+
+(defmethod copy-to-alien-form  (form (type t) &rest args)
+  (apply #'to-alien-form form type args))
+
+(defmethod copy-to-alien-function  ((type t) &rest args)
+  (apply #'to-alien-function type args))
+
+(defmethod copy-from-alien-form  (form (type t) &rest args)
+  (apply #'from-alien-form form type args))
+
+(defmethod copy-from-alien-function  ((type t) &rest args)
+  (apply #'from-alien-function type args))
+
+(defmethod alien-type ((type (eql 'signed-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (ecase size
+      (#.+bits-of-byte+ #+cmu'(alien:signed 8) #+sbcl'(sb-alien:signed 8))
+      (#.+bits-of-short+ #+cmu 'c-call:short #+sbcl 'sb-alien:short)
+      ((* #.+bits-of-int+) #+cmu 'c-call:int #+sbcl 'sb-alien:int)
+      (#.+bits-of-long+ #+cmu 'c-call:long #+sbcl 'sb-alien:long))))
+
+(defmethod size-of ((type (eql 'signed-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (ecase size
+      (#.+bits-of-byte+ 1)
+      (#.+bits-of-short+ +size-of-short+)
+      ((* #.+bits-of-int+) +size-of-int+)
+      (#.+bits-of-long+ +size-of-long+))))
+
+(defmethod unbound-value ((type t) &rest args)
+  (declare (ignore type args))
+  nil)
 
+(defmethod writer-function ((type (eql 'signed-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (let ((size (if (eq size '*) +bits-of-int+ size)))
+      (ecase size
+	(8 #'(lambda (value location &optional (offset 0))
+	       (setf (signed-sap-ref-8 location offset) value)))
+	(16 #'(lambda (value location &optional (offset 0))
+		(setf (signed-sap-ref-16 location offset) value)))
+	(32 #'(lambda (value location &optional (offset 0))
+		(setf (signed-sap-ref-32 location offset) value)))
+	(64 #'(lambda (value location &optional (offset 0))
+		(setf (signed-sap-ref-64 location offset) value)))))))
+  
+(defmethod reader-function ((type (eql 'signed-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (let ((size (if (eq size '*) +bits-of-int+ size)))
+      (ecase size
+	(8 #'(lambda (sap &optional (offset 0) weak-p) 
+	       (declare (ignore weak-p))
+	       (signed-sap-ref-8 sap offset)))
+	(16 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p))
+		(signed-sap-ref-16 sap offset)))
+	(32 #'(lambda (sap &optional (offset 0) weak-p) 
+		(declare (ignore weak-p)) 
+		(signed-sap-ref-32 sap offset)))
+	(64 #'(lambda (sap &optional (offset 0) weak-p) 
+		(declare (ignore weak-p))
+		(signed-sap-ref-64 sap offset)))))))
+
+(defmethod alien-type ((type (eql 'unsigned-byte)) &rest args)
+  (destructuring-bind (&optional (size '*)) args
+    (ecase size
+      (#.+bits-of-byte+ #+cmu'(alien:unsigned 8) #+sbcl'(sb-alien:unsigned 8))
+      (#.+bits-of-short+ #+cmu 'c-call:unsigned-short 
+			 #+sbcl 'sb-alien:unsigned-short)
+      ((* #.+bits-of-int+) #+cmu 'c-call:unsigned-int 
+                           #+sbcl 'sb-alien:unsigned-int)
+      (#.+bits-of-long+ #+cmu 'c-call:unsigned-long 
+			#+sbcl 'sb-alien:unsigned-long))))
+
+(defmethod size-of ((type (eql 'unsigned-byte)) &rest args)
+  (apply #'size-of 'signed args))
+
+(defmethod writer-function ((type (eql 'unsigned-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (let ((size (if (eq size '*) +bits-of-int+ size)))
+      (ecase size
+	(8 #'(lambda (value location &optional (offset 0))
+	       (setf (sap-ref-8 location offset) value)))
+	(16 #'(lambda (value location &optional (offset 0))
+		(setf (sap-ref-16 location offset) value)))
+	(32 #'(lambda (value location &optional (offset 0))
+		(setf (sap-ref-32 location offset) value)))
+	(64 #'(lambda (value location &optional (offset 0))
+		(setf (sap-ref-64 location offset) value)))))))
+      
+(defmethod reader-function ((type (eql 'unsigned-byte)) &rest args)
+  (declare (ignore type))
+  (destructuring-bind (&optional (size '*)) args
+    (let ((size (if (eq size '*) +bits-of-int+ size)))
+      (ecase size
+	(8 #'(lambda (sap &optional (offset 0) weak-p)
+	       (declare (ignore weak-p))
+	       (sap-ref-8 sap offset)))
+	(16 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p)) 
+		(sap-ref-16 sap offset)))
+	(32 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p)) 
+		(sap-ref-32 sap offset)))
+	(64 #'(lambda (sap &optional (offset 0) weak-p)
+		(declare (ignore weak-p))
+		(sap-ref-64 sap offset)))))))
+  
+  
+(defmethod alien-type ((type (eql 'integer)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'signed-byte))
 
-(deftype-method translate-type-spec unsigned-int (type-spec)
-  (declare (ignore type-spec))
-  `(unsigned ,(* +bits-per-unit+ +size-of-int+)))
+(defmethod size-of ((type (eql 'integer)) &rest args)
+  (declare (ignore type args))
+  (size-of 'signed-byte))
 
-(deftype-method size-of unsigned-int (type-spec)
-  (declare (ignore type-spec))
-  +size-of-int+)
+(defmethod writer-function ((type (eql 'integer)) &rest args)
+  (declare (ignore type args))
+  (writer-function 'signed-byte))
 
+(defmethod reader-function ((type (eql 'integer)) &rest args)
+  (declare (ignore type args))
+  (reader-function 'signed-byte))
 
-(deftype-method translate-type-spec short (type-spec)
-  (declare (ignore type-spec))
-  `(signed ,(* +bits-per-unit+ +size-of-short+)))
 
-(deftype-method size-of short (type-spec)
-  (declare (ignore type-spec))
-  +size-of-short+)
+(defmethod alien-type ((type (eql 'fixnum)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'signed-byte))
 
+(defmethod size-of ((type (eql 'fixnum)) &rest args)
+  (declare (ignore type args))
+  (size-of 'signed-byte))
 
-(deftype-method translate-type-spec unsigned-short (type-spec)
-  (declare (ignore type-spec))
-  `(unsigned ,(* +bits-per-unit+ +size-of-short+)))
 
-(deftype-method size-of unsigned-short (type-spec)
-  (declare (ignore type-spec))
-  +size-of-short+)
+(defmethod alien-type ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  #+cmu 'alien:single-float #+sbcl 'sb-alien:single-float)
 
+(defmethod size-of ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  +size-of-float+)
 
-(deftype-method translate-type-spec signed-byte (type-spec)
-  (let ((size (second (mklist (type-expand-to 'signed-byte type-spec)))))
-    `(signed
-      ,(cond
-	((member size '(nil *)) (* +bits-per-unit+ +size-of-int+))
-	(t size)))))
+(defmethod to-alien-form (form (type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  `(coerce ,form 'single-float))
 
-(deftype-method size-of signed-byte (type-spec)
-  (let ((size (second (mklist (type-expand-to 'signed-byte type-spec)))))
-    (cond
-     ((member size '(nil *)) +size-of-int+)
-     (t (/ size +bits-per-unit+)))))
+(defmethod to-alien-function ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (number)
+      (coerce number 'single-float)))
 
-(deftype-method translate-to-alien signed-byte (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod writer-function ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (value location &optional (offset 0))
+      (setf (sap-ref-single location offset) (coerce value 'single-float))))
 
-(deftype-method translate-from-alien signed-byte
-    (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod reader-function ((type (eql 'single-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (sap &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (sap-ref-single sap offset)))
 
 
-(deftype-method translate-type-spec unsigned-byte (type-spec)
-  (let ((size (second (mklist (type-expand-to 'unsigned-byte type-spec)))))
-    `(signed
-      ,(cond
-	((member size '(nil *)) (* +bits-per-unit+ +size-of-int+))
-	(t size)))))
+(defmethod alien-type ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  #+cmu 'alien:double-float #+sbcl 'sb-alien:double-float)
 
-(deftype-method size-of unsigned-byte (type-spec)
-  (let ((size (second (mklist (type-expand-to 'unsigned-byte type-spec)))))
-    (cond
-     ((member size '(nil *)) +size-of-int+)
-     (t (/ size +bits-per-unit+)))))
+(defmethod size-of ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  +size-of-double+)
 
-(deftype-method translate-to-alien unsigned-byte (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod to-alien-form (form (type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  `(coerce ,form 'double-float))
 
-(deftype-method translate-from-alien unsigned-byte
-    (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod to-alien-function ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (number)
+      (coerce number 'double-float)))
 
+(defmethod writer-function ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (value location &optional (offset 0))
+      (setf (sap-ref-double location offset) (coerce value 'double-float))))
 
-(deftype-method translate-type-spec single-float (type-spec)
-  (declare (ignore type-spec))
-  'single-float)
+(defmethod reader-function ((type (eql 'double-float)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (sap &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (sap-ref-double sap offset)))
 
-(deftype-method size-of single-float (type-spec)
-  (declare (ignore type-spec))
-  +size-of-float+)
 
-(deftype-method translate-to-alien single-float (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod alien-type ((type (eql 'base-char)) &rest args)
+  (declare (ignore type args))
+  #+cmu 'c-call:char #+sbcl 'sb-alien:char)
 
-(deftype-method translate-from-alien single-float
-    (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod size-of ((type (eql 'base-char)) &rest args)
+  (declare (ignore type args))
+  1)
 
+(defmethod writer-function ((type (eql 'base-char)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (char location &optional (offset 0))
+      (setf (sap-ref-8 location offset) (char-code char))))
 
-(deftype-method translate-type-spec double-float (type-spec)
-  (declare (ignore type-spec))
-  'double-float)
+(defmethod reader-function ((type (eql 'base-char)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (code-char (sap-ref-8 location offset))))
 
-(deftype-method size-of double-float (type-spec)
-  (declare (ignore type-spec))
-  +size-of-double+)
 
-(deftype-method translate-to-alien double-float (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(coerce ,number 'double-float))
+(defmethod alien-type ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
 
-(deftype-method translate-from-alien double-float
-    (type-spec number &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  number)
+(defmethod size-of ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  (size-of 'pointer))
 
+(defmethod to-alien-form (string (type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  `(let ((string ,string))
+     ;; Always copy strings to prevent seg fault due to GC
+     #+cmu
+     (copy-memory
+      (vector-sap (coerce string 'simple-base-string))
+      (1+ (length string)))
+     #+sbcl
+     (let ((utf8 (%deport-utf8-string string)))
+       (copy-memory (vector-sap utf8) (length utf8)))))
+  
+(defmethod to-alien-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (string)
+      #+cmu
+      (copy-memory
+       (vector-sap (coerce string 'simple-base-string))
+       (1+ (length string)))
+      #+sbcl
+      (let ((utf8 (%deport-utf8-string string)))
+	(copy-memory (vector-sap utf8) (length utf8)))))
+
+(defmethod from-alien-form (string (type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  `(let ((string ,string))
+    (unless (null-pointer-p string)
+      (prog1
+	  #+cmu(%naturalize-c-string string)
+	  #+sbcl(%naturalize-utf8-string string)
+	(deallocate-memory string)))))
+
+(defmethod from-alien-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (string)
+      (unless (null-pointer-p string)
+	(prog1
+	    #+cmu(%naturalize-c-string string)
+	    #+sbcl(%naturalize-utf8-string string)
+	  (deallocate-memory string)))))
 
-(deftype-method translate-type-spec base-char (type-spec)
-  (declare (ignore type-spec))
-  `(unsigned ,+bits-per-unit+))
+(defmethod cleanup-form (string (type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  `(let ((string ,string))
+    (unless (null-pointer-p string)
+      (deallocate-memory string))))
 
-(deftype-method size-of base-char (type-spec)
-  (declare (ignore type-spec))
-  1)
+(defmethod cleanup-function ((type (eql 'string)) &rest args)
+  (declare (ignore args))
+  #'(lambda (string)
+      (unless (null-pointer-p string)
+	(deallocate-memory string))))
 
-(deftype-method translate-to-alien base-char (type-spec char &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(char-code ,char))
+(defmethod copy-from-alien-form (string (type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  `(let ((string ,string))
+    (unless (null-pointer-p string)
+      #+cmu(%naturalize-c-string string)
+      #+sbcl(%naturalize-utf8-string string))))
+
+(defmethod copy-from-alien-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (string)
+      (unless (null-pointer-p string)
+	#+cmu(%naturalize-c-string string)
+	#+sbcl(%naturalize-utf8-string string))))
+
+(defmethod writer-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (string location &optional (offset 0))
+      (assert (null-pointer-p (sap-ref-sap location offset)))
+      (setf (sap-ref-sap location offset)
+       #+cmu
+       (copy-memory
+	(vector-sap (coerce string 'simple-base-string))
+	(1+ (length string)))
+       #+sbcl
+       (let ((utf8 (%deport-utf8-string string)))
+	 (copy-memory (vector-sap utf8) (length utf8))))))
+
+(defmethod reader-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (unless (null-pointer-p (sap-ref-sap location offset))
+	#+cmu(%naturalize-c-string (sap-ref-sap location offset))
+	#+sbcl(%naturalize-utf8-string (sap-ref-sap location offset)))))
+
+(defmethod destroy-function ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (location &optional (offset 0))
+      (unless (null-pointer-p (sap-ref-sap location offset))
+	(deallocate-memory (sap-ref-sap location offset))
+	(setf (sap-ref-sap location offset) (make-pointer 0)))))
+
+(defmethod unbound-value ((type (eql 'string)) &rest args)
+  (declare (ignore type args))
+  (values t nil))
+
+
+(defmethod alien-type ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'string))
+
+(defmethod size-of ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (size-of 'string))
 
-(deftype-method translate-from-alien base-char (type-spec code &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(code-char ,code))
+(defmethod to-alien-form (path (type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (to-alien-form `(namestring (translate-logical-pathname ,path)) 'string))
+
+(defmethod to-alien-function ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (let ((string-function (to-alien-function 'string)))
+    #'(lambda (path)
+	(funcall string-function (namestring path)))))
+
+(defmethod from-alien-form (string (type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  `(parse-namestring ,(from-alien-form string 'string)))
+
+(defmethod from-alien-function ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (let ((string-function (from-alien-function 'string)))
+    #'(lambda (string)
+	(parse-namestring (funcall string-function string)))))
+
+(defmethod cleanup-form (string (type (eql 'pathnanme)) &rest args)
+  (declare (ignore type args))
+  (cleanup-form string 'string))
+
+(defmethod cleanup-function ((type (eql 'pathnanme)) &rest args)
+  (declare (ignore type args))
+  (cleanup-function 'string))
+
+(defmethod writer-function ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (let ((string-writer (writer-function 'string)))
+    #'(lambda (path location &optional (offset 0))
+	(funcall string-writer (namestring path) location offset))))
+
+(defmethod reader-function ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (let ((string-reader (reader-function 'string)))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (let ((string (funcall string-reader location offset)))
+	(when string
+	  (parse-namestring string))))))
+
+(defmethod destroy-function ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (destroy-function 'string))
+
+(defmethod unbound-value ((type (eql 'pathname)) &rest args)
+  (declare (ignore type args))
+  (unbound-value 'string))
+
+
+(defmethod alien-type ((type (eql 'boolean)) &rest args)
+  (apply #'alien-type 'signed-byte args))
+
+(defmethod size-of ((type (eql 'boolean)) &rest args)
+  (apply #'size-of 'signed-byte args))
+
+(defmethod to-alien-form (boolean (type (eql 'boolean)) &rest args)
+  (declare (ignore type args))
+  `(if ,boolean 1 0))
 
+(defmethod to-alien-function ((type (eql 'boolean)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (boolean)
+      (if boolean 1 0)))
+
+(defmethod from-alien-form (boolean (type (eql 'boolean)) &rest args)
+  (declare (ignore type args))
+  `(not (zerop ,boolean)))
+
+(defmethod from-alien-function ((type (eql 'boolean)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (boolean)
+      (not (zerop boolean))))
+
+(defmethod writer-function ((type (eql 'boolean)) &rest args)
+  (declare (ignore type))
+  (let ((writer (apply #'writer-function 'signed-byte args)))
+    #'(lambda (boolean location &optional (offset 0))
+	(funcall writer (if boolean 1 0) location offset))))
+
+(defmethod reader-function ((type (eql 'boolean)) &rest args)
+  (declare (ignore type))
+  (let ((reader (apply #'reader-function 'signed-byte args)))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (not (zerop (funcall reader location offset))))))
+
+
+(defmethod alien-type ((type (eql 'or)) &rest args)
+  (let ((alien-type (alien-type (first args))))
+    (unless (every #'(lambda (type)
+		       (eq alien-type (alien-type type)))
+		   (rest args))
+      (error "No common alien type specifier for union type: ~A" 
+       (cons type args)))
+    alien-type))
 
-(deftype-method translate-type-spec string (type-spec)
-  (declare (ignore type-spec))
+(defmethod size-of ((type (eql 'or)) &rest args)
+  (declare (ignore type))
+  (size-of (first args)))
+
+(defmethod to-alien-form (form (type (eql 'or)) &rest args)
+  (declare (ignore type))
+  `(let ((value ,form))
+    (etypecase value
+      ,@(mapcar	 
+	 #'(lambda (type)
+	     `(,type ,(to-alien-form 'value type)))
+	 args))))
+
+(defmethod to-alien-function ((type (eql 'or)) &rest types)
+  (declare (ignore type))
+  (let ((functions (mapcar #'to-alien-function types)))
+    #'(lambda (value)
+	(loop
+	 for function in functions
+	 for type in types
+	 when (typep value type)
+	 do (return (funcall function value))
+	 finally (error "~S is not of type ~A" value `(or ,@types))))))
+
+(defmethod alien-type ((type (eql 'system-area-pointer)) &rest args)
+  (declare (ignore type args))
   'system-area-pointer)
 
-(deftype-method size-of string (type-spec)
-  (declare (ignore type-spec))
-  +size-of-sap+)
+(defmethod size-of ((type (eql 'system-area-pointer)) &rest args)
+  (declare (ignore type args))
+  +size-of-pointer+)
 
-(deftype-method translate-to-alien string (type-spec string &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(let ((string ,string))
-     ;; Always copy strings to prevent seg fault due to GC
-     (copy-memory
-      (make-pointer (1+ (kernel:get-lisp-obj-address string)))
-      (1+ (length string)))))
-
-(deftype-method translate-from-alien string
-    (type-spec c-string &optional weak-ref)
-  (declare (ignore type-spec))
-  `(let ((c-string ,c-string))
-     (unless (null-pointer-p c-string)
-       (prog1
-	   (c-call::%naturalize-c-string c-string)
-	 ;,(unless weak-ref `(deallocate-memory c-string))
-	 ))))
-
-(deftype-method cleanup-alien string (type-spec c-string &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec c-string)))
-
-(deftype-method unreference-alien string (type-spec c-string)
-  (declare (ignore type-spec))
-  `(let ((c-string ,c-string))
-     (unless (null-pointer-p c-string)
-       (deallocate-memory c-string))))
-
-
-;;; Pathname
-
-(deftype-method translate-type-spec pathname (type-spec)
-  (declare (ignore type-spec))
-  (translate-type-spec 'string))
-
-(deftype-method size-of pathname (type-spec)
-  (declare (ignore type-spec))
-  (size-of 'string))
+(defmethod writer-function ((type (eql 'system-area-pointer)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (sap location &optional (offset 0))
+      (setf (sap-ref-sap location offset) sap)))
 
-(deftype-method translate-to-alien pathname (type-spec path &optional weak-ref)
-  (declare (ignore type-spec))
-  (translate-to-alien 'string 
-   `(namestring (translate-logical-pathname ,path)) weak-ref))
+(defmethod reader-function ((type (eql 'system-area-pointer)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (sap-ref-sap location offset)))
 
-(deftype-method translate-from-alien pathname (type-spec c-string &optional weak-ref)
-  (declare (ignore type-spec))
-  `(parse-namestring ,(translate-from-alien 'string c-string weak-ref)))
 
-(deftype-method cleanup-alien pathname (type-spec c-string &optional weak-ref)
-  (declare (ignore type-spec))
-  (cleanup-alien 'string c-string weak-ref))
+(defmethod alien-type ((type (eql 'null)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
 
-(deftype-method unreference-alien pathname (type-spec c-string)
-  (declare (ignore type-spec))
-  (unreference-alien 'string c-string))
-  
+(defmethod size-of ((type (eql 'null)) &rest args)
+  (declare (ignore type args))
+  (size-of 'pointer))
 
-(deftype-method translate-type-spec boolean (type-spec)
-  (translate-type-spec
-   (cons 'unsigned (cdr (mklist (type-expand-to 'boolean type-spec))))))
+(defmethod to-alien-form (null (type (eql 'null)) &rest args)
+  (declare (ignore null type args))
+  `(make-pointer 0))
 
-(deftype-method size-of boolean (type-spec)
-  (size-of
-   (cons 'unsigned (cdr (mklist (type-expand-to 'boolean type-spec))))))
+(defmethod to-alien-function ((type (eql 'null)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (null)
+      (declare (ignore null))
+      (make-pointer 0)))
 
-(deftype-method translate-to-alien boolean (type-spec boolean &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(if ,boolean 1 0))
 
-(deftype-method translate-from-alien boolean (type-spec int &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(not (zerop ,int)))
+(defmethod alien-type ((type (eql 'nil)) &rest args)
+  (declare (ignore type args))
+  'void)
 
+(defmethod from-alien-function ((type (eql 'nil)) &rest args)
+  (declare (ignore type args))
+  #'(lambda (value)
+      (declare (ignore value))
+      (values)))
 
-(deftype-method translate-type-spec or (union-type)
-  (let* ((member-types (cdr (type-expand-to 'or union-type)))
-	 (alien-type (translate-type-spec (first member-types))))
-    (dolist (type (cdr member-types))
-      (unless (eq alien-type (translate-type-spec type))
-	(error "No common alien type specifier for union type: ~A" union-type)))
-    alien-type))
 
-(deftype-method size-of or (union-type)
-  (size-of (first (cdr (type-expand-to 'or union-type)))))
+(defmethod alien-type ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (alien-type (first args)))
 
-(deftype-method translate-to-alien or (union-type-spec expr &optional weak-ref)
-  (destructuring-bind (name &rest type-specs)
-      (type-expand-to 'or union-type-spec)
-    (declare (ignore name))
-    `(let ((value ,expr))
-       (etypecase value
-	 ,@(map
-	    'list
-	      #'(lambda (type-spec)
-		  (list type-spec (translate-to-alien type-spec 'value weak-ref)))
-	      type-specs)))))
+(defmethod size-of ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (size-of (first args)))
 
+(defmethod to-alien-form (form (type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (copy-to-alien-form form (first args)))
 
-(deftype-method translate-type-spec system-area-pointer (type-spec)
-  (declare (ignore type-spec))
-  'system-area-pointer)
+(defmethod to-alien-function ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (copy-to-alien-function (first args)))
 
-(deftype-method size-of system-area-pointer (type-spec)
-  (declare (ignore type-spec))
-  +size-of-sap+)
+(defmethod from-alien-form (form (type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (copy-from-alien-form form (first args)))
 
-(deftype-method translate-to-alien system-area-pointer (type-spec sap &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  sap)
+(defmethod from-alien-function ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (copy-from-alien-function (first args)))
 
-(deftype-method translate-from-alien system-area-pointer
-    (type-spec sap &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  sap)
+(defmethod reader-function ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (reader-function (first args)))
 
+(defmethod writer-function ((type (eql 'copy-of)) &rest args)
+  (declare (ignore type))
+  (writer-function (first args)))
 
-(deftype-method translate-type-spec null (type-spec)
-  (declare (ignore type-spec))
-  'system-area-pointer)
 
-(deftype-method translate-to-alien null (type-spec expr &optional weak-ref)
-  (declare (ignore type-spec expr weak-ref))
-  `(make-pointer 0))
+(defmethod alien-type ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (alien-type 'pointer))
 
+#+nil
+(defmethod size-of ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (size-of 'pointer))
 
-(deftype-method translate-type-spec nil (type-spec)
-  (declare (ignore type-spec))
-  'void)
+(defmethod to-alien-form (callback (type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  `(callback-address ,callback))
 
-(deftype-method translate-from-alien nil (type-spec expr &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(progn
-     ,expr
-     (values)))
+(defmethod to-alien-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #'callback-address)
+
+#+nil(
+#+cmu
+(defun find-callback (pointer)
+  (find pointer alien::*callbacks* :key #'callback-trampoline :test #'sap=))
+
+(defmethod from-alien-form (pointer (type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu  `(find-callback ,pointer)
+  #+sbcl `(sb-alien::%find-alien-function ,pointer))
+
+(defmethod from-alien-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  #+cmu  #'find-callback
+  #+sbcl #'sb-alien::%find-alien-function)
+
+(defmethod writer-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (let ((writer (writer-function 'pointer))
+	(to-alien (to-alien-function 'callback)))
+    #'(lambda (callback location &optional (offset 0))
+	(funcall writer (funcall to-alien callback) location offset))))
+
+(defmethod reader-function ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (let ((reader (reader-function 'pointer))
+	(from-alien (from-alien-function 'callback)))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
+      (let ((pointer (funcall reader location offset)))
+	(unless (null-pointer-p pointer)
+	  (funcall from-alien pointer))))))
+
+(defmethod unbound-value ((type (eql 'callback)) &rest args)
+  (declare (ignore type args))
+  (values t nil))
+)
\ No newline at end of file