X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.cl;h=ee529806dcd8a55c3f981be65c9d2a4337936ba0;hb=d25b7a871d8122e48eaddac75f3ef27434433c4d;hp=a0bcae74361768916e7d066a5478042d07e90830;hpb=f3c0481a74e3289b222c26051fc817cc69e133a6;p=uffi.git

diff --git a/src/primitives.cl b/src/primitives.cl
index a0bcae7..ee52980 100644
--- a/src/primitives.cl
+++ b/src/primitives.cl
@@ -7,24 +7,13 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: primitives.cl,v 1.5 2002/03/14 21:32:23 kevin Exp $
 ;;;;
-;;;; $Id: primitives.cl,v 1.2 2002/03/10 22:29:47 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)))
@@ -36,21 +25,16 @@
      (defconstant ,name ,value)
      (export ',name)))
 
-(defmacro uffi-declare (type name)
-  "Generates a declare statement for CL. Currently, only CMUCL
-supports this."
-  #+(or lispworks allegro)
-  (declare (ignore type name))
-  #+cmu
-  `(declare (type (alien:alien ,type)) ,name)
-  )
-
-(defmacro slot-type (type)
+(defmacro def-type (name type)
+  "Generates a (deftype) statement for CL. Currently, only CMUCL
+supports takes advantage of this optimization."
   #+(or lispworks allegro)
   (declare (ignore type))
   #+(or lispworks allegro)
-  t
-  #+cmu `'(alien:alien ,type))
+  `(deftype ,name () t)
+  #+cmu
+  `(deftype ,name () '(alien:alien ,(convert-from-uffi-type type :declare)))
+  )
 
 (defmacro null-char-p (val)
   `(if (or (eql ,val 0)
@@ -59,7 +43,7 @@ supports this."
     nil))
 
       
-(defmacro def-type (name type)
+(defmacro def-foreign-type (name type)
   #+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
   #+allegro `(ff:def-foreign-type ,name ,(convert-from-uffi-type type :type))
   #+cmu `(alien:def-alien-type ,name ,(convert-from-uffi-type type :type))
@@ -131,7 +115,7 @@ supports this."
 (dolist (type +cmu-def-type-list+)
   (setf (gethash (car type) +cmu-def-type-hash+) (cdr type)))
 
-(defun ph (&optional (os *standard-output*))
+(defmethod ph (&optional (os *standard-output*))
   (maphash #'(lambda (k v) (format os "~&~S => ~S" k v)) +type-conversion-hash+))
 
 (defun convert-from-uffi-type (type context)