X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fprimitives.lisp;h=73027ef4c37798c83656dcd536f437f8b2a160b4;hb=b2a3a6e6f3e5adf857ba4e2c80b8e4f8a3124a33;hp=2bc63c2d175e9871b1ec30d3cc195ffca9f2d79f;hpb=db166e2970e1aaabd611e243eb899ae4d2f5f5ff;p=uffi.git

diff --git a/src/primitives.lisp b/src/primitives.lisp
index 2bc63c2..73027ef 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.10 2003/08/14 21:40:13 kevin Exp $
+;;;; $Id: primitives.lisp,v 1.12 2003/08/15 02:34:34 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -85,8 +85,6 @@ 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)
@@ -130,14 +128,13 @@ supports takes advantage of this optimization."
 #+(or cmu scl)
 (setq *type-conversion-list*
     '((* . *) (:void . c-call:void) 
-      (:short . c-call:short)
       (:pointer-void . (* t))
       (:cstring . c-call:c-string)
       (:char . c-call:char) 
       (:unsigned-char . (alien:unsigned 8))
       (:byte . (alien:signed 8))
       (:unsigned-byte . (alien:unsigned 8))
-      (:short . c-call:unsigned-short) 
+      (:short . c-call:short)
       (:unsigned-short . c-call:unsigned-short)
       (:int . alien:integer) (:unsigned-int . c-call:unsigned-int) 
       (:long . c-call:long) (:unsigned-long . c-call:unsigned-long)
@@ -147,14 +144,13 @@ supports takes advantage of this optimization."
 #+sbcl
 (setq *type-conversion-list*
     '((* . *) (:void . sb-alien:void) 
-      (:short . sb-alien:short)
       (:pointer-void . (* t))
       (:cstring . sb-alien:c-string)
       (:char . sb-alien:char) 
       (:unsigned-char . (sb-alien:unsigned 8))
       (:byte . (sb-alien:signed 8))
       (:unsigned-byte . (sb-alien:unsigned 8))
-      (:short . sb-alien:unsigned-short) 
+      (:short . sb-alien:short)
       (:unsigned-short . sb-alien:unsigned-short)
       (:int . sb-alien:integer) (:unsigned-int . sb-alien:unsigned-int) 
       (:long . sb-alien:long) (:unsigned-long . sb-alien:unsigned-long)
@@ -225,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)))
 
@@ -249,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
@@ -284,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)))