X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fobjects.cl;h=0f28115a0cbd24565ad81b915475212994923d77;hb=cdd366616d5a526546a26adbded8c562dfce743f;hp=c8d219b53eb30dc94fa142aac3b4c34f607b2091;hpb=e6a4defeedc65126598fb820cef577055c80b5c2;p=uffi.git

diff --git a/src/objects.cl b/src/objects.cl
index c8d219b..0f28115 100644
--- a/src/objects.cl
+++ b/src/objects.cl
@@ -1,4 +1,4 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -7,24 +7,13 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: objects.cl,v 1.6 2002/03/17 17:33:30 kevin Exp $
 ;;;;
-;;;; $Id: objects.cl,v 1.4 2002/03/11 18:20:10 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of the UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI 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 General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software
-;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
@@ -65,11 +54,18 @@
 
 (defmacro deref-pointer (ptr type)
   "Returns a object pointed"
-  #+(or lispworks cmu) (declare (ignore type))
-  #+cmu  `(alien:deref ,ptr)
-  #+lispworks `(fli:dereference ,ptr)
-  #+allegro `(ff:fslot-value-typed ,type :c ,ptr)
-  )
+  (let ((result (gensym)))
+    `(let ((,result
+	    #+cmu  (alien:deref ,ptr)
+	    #+lispworks (fli:dereference ,ptr)
+	    #+allegro (ff:fslot-value-typed ,type :c ,ptr)
+	    ))
+      (if (and
+	   (or (eq ,type :char)
+	       (eq ,type :unsigned-char))
+	   (numberp ,result))
+	  (code-char ,result)
+	  ,result))))
 
 (defmacro pointer-address (obj)
   #+cmu