X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=3eb0761f522e8a0495473d5397833f20e954b222;hb=6f7ce2ee216d141886f43ce07befd0c2668bcefb;hp=1e860fb5b582979891027899ad9174a0bb15b189;hpb=7612015bdcfa851374a4e8c6f3ff68a8dd8b9a9a;p=uffi.git

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 1e860fb..3eb0761 100644
--- a/src/primitives.lisp
+++ b/src/primitives.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: primitives.lisp,v 1.11 2003/08/14 21:58:29 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -85,13 +85,8 @@ supports takes advantage of this optimization."
   (defvar +type-conversion-hash+ (make-hash-table :size 20 :test #'eq))
   #+(or cmu sbcl scl) (defvar *cmu-def-type-hash*
 			(make-hash-table :size 20 :test #'eq))
-  #+allegro (defvar *allegro-foreign-type-hash*
-	      (make-hash-table :size 20 :test #'eq))
   )
 
-#+(or cmu sbcl scl)
-(defvar *cmu-sbcl-def-type-list* nil)
-
 #+(or cmu scl)
 (defvar *cmu-sbcl-def-type-list*
     '((:char . (alien:signed 8))
@@ -106,8 +101,10 @@ supports takes advantage of this optimization."
       (:unsigned-long . (alien:unsigned 32))
       (:float . alien:single-float)
       (:double . alien:double-float)
+      (:void . t)
       )
   "Conversions in CMUCL for def-foreign-type are different than in def-function")
+
 #+sbcl
 (defvar *cmu-sbcl-def-type-list*
     '((:char . (sb-alien:signed 8))
@@ -122,6 +119,7 @@ supports takes advantage of this optimization."
       (:unsigned-long . (sb-alien:unsigned 32))
       (:float . sb-alien:single-float)
       (:double . sb-alien:double-float)
+      (:void . t)
       )
   "Conversions in SBCL for def-foreign-type are different than in def-function")
 
@@ -223,23 +221,6 @@ supports takes advantage of this optimization."
        (:float . :single-float) (:double . :double-float)
        (:array . :array)))
 
-#+allegro
-(defvar *allegro-foreign-type-list*
-    '((:char . :signed-byte)
-      (:unsigned-char . :unsigned-byte)
-      (:byte . :signed-byte)
-      (:unsigned-byte . :unsigned-byte)
-      (:short . :signed-word)
-      (:unsigned-short . :unsigned-word)
-      (:int . :signed-long)
-      (:unsigned-int . :unsigned-long32)
-      (:long . :signed-long)
-      (:unsigned-long . :unsigned-long)
-      (:float . :single-float)
-      (:double . :double-float)
-      )
-  "Conversion for Allegro's system:memref function")
-
 (dolist (type *type-conversion-list*)
   (setf (gethash (car type) +type-conversion-hash+) (cdr type)))
 
@@ -247,14 +228,6 @@ supports takes advantage of this optimization."
 (dolist (type *cmu-sbcl-def-type-list*)
   (setf (gethash (car type) *cmu-def-type-hash*) (cdr type)))
 
-#+allegro
-(dolist (type *allegro-foreign-type-list*)
-  (setf (gethash (car type) *allegro-foreign-type-hash*) (cdr type)))
-
-(defun foreign-var-type-convert (type)
-  #+allegro (gethash type *allegro-foreign-type-hash*))
-
-  
 (defun basic-convert-from-uffi-type (type)
   (let ((found-type (gethash type +type-conversion-hash+)))
     (if found-type
@@ -282,9 +255,6 @@ supports takes advantage of this optimization."
 	(basic-convert-from-uffi-type :cstring-returning))
        #+(and mcl (not openmcl))
        ((and (eq type :void) (eq context :return)) nil)
-       #+allegro
-       ((eq context :foreign-var)
-	(foreign-var-type-convert type))
        (t
 	(basic-convert-from-uffi-type type)))
     (let ((sub-type (car type)))
@@ -316,3 +286,20 @@ supports takes advantage of this optimization."
      ((and (eq (car result) :pointer) (eq context :allocation) :pointer))
      (t result))))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (char= #\a (schar (symbol-name '#:a) 0))
+    (pushnew :uffi-lowercase-reader *features*))
+  (when (not (string= (symbol-name '#:a)
+		      (symbol-name '#:A)))
+    (pushnew :uffi-case-sensitive *features*)))
+
+(defun make-lisp-name (name)
+  (let ((converted (substitute #\- #\_ name)))
+     (intern 
+      #+uffi-case-sensitive converted
+      #+(and (not uffi-lowercase-reader) (not uffi-case-sensitive)) (string-upcase converted)
+      #+(and uffi-lowercase-reader (not uffi-case-sensitive)) (string-downcase converted))))
+
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (setq cl:*features* (delete :uffi-lowercase-reader *features*))
+  (setq cl:*features* (delete :uffi-case-sensitive *features*)))