projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r9048:
[uffi.git]
/
src
/
primitives.lisp
diff --git
a/src/primitives.lisp
b/src/primitives.lisp
index 03530669ff87ed7cfc31f3756d07f6f9445bd769..c430894f711922ace55c007c5e25b1e660128575 100644
(file)
--- a/
src/primitives.lisp
+++ b/
src/primitives.lisp
@@
-2,12
+2,12
@@
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: primitives.
cl
+;;;; Name: primitives.
lisp
;;;; Purpose: UFFI source to handle immediate types
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
;;;; Purpose: UFFI source to handle immediate types
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id
: primitives.lisp,v 1.8 2002/12/15 17:11:08 kevin Exp
$
+;;;; $Id$
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-16,8
+16,7
@@
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :uffi)
+(in-package #:uffi)
#+mcl
(defvar *keyword-package* (find-package "KEYWORD"))
#+mcl
(defvar *keyword-package* (find-package "KEYWORD"))
@@
-83,15
+82,13
@@
supports takes advantage of this optimization."
)
(eval-when (:compile-toplevel :load-toplevel :execute)
)
(eval-when (:compile-toplevel :load-toplevel :execute)
- (defvar +type-conversion-hash+ (make-hash-table :size 20))
- #+(or cmu sbcl scl) (defvar *cmu-def-type-hash* (make-hash-table :size 20))
+ (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))
)
)
-#+(or cmu sbcl scl)
-(defparameter *cmu-sbcl-def-type-list* nil)
-
#+(or cmu scl)
#+(or cmu scl)
-(def
paramete
r *cmu-sbcl-def-type-list*
+(def
va
r *cmu-sbcl-def-type-list*
'((:char . (alien:signed 8))
(:unsigned-char . (alien:unsigned 8))
(:byte . (alien:signed 8))
'((:char . (alien:signed 8))
(:unsigned-char . (alien:unsigned 8))
(:byte . (alien:signed 8))
@@
-104,10
+101,12
@@
supports takes advantage of this optimization."
(:unsigned-long . (alien:unsigned 32))
(:float . alien:single-float)
(:double . alien:double-float)
(: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")
)
"Conversions in CMUCL for def-foreign-type are different than in def-function")
+
#+sbcl
#+sbcl
-(def
paramete
r *cmu-sbcl-def-type-list*
+(def
va
r *cmu-sbcl-def-type-list*
'((:char . (sb-alien:signed 8))
(:unsigned-char . (sb-alien:unsigned 8))
(:byte . (sb-alien:signed 8))
'((:char . (sb-alien:signed 8))
(:unsigned-char . (sb-alien:unsigned 8))
(:byte . (sb-alien:signed 8))
@@
-120,22
+119,22
@@
supports takes advantage of this optimization."
(:unsigned-long . (sb-alien:unsigned 32))
(:float . sb-alien:single-float)
(:double . sb-alien:double-float)
(: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")
)
"Conversions in SBCL for def-foreign-type are different than in def-function")
-(def
paramete
r *type-conversion-list* nil)
+(def
va
r *type-conversion-list* nil)
#+(or cmu scl)
(setq *type-conversion-list*
'((* . *) (:void . c-call:void)
#+(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))
(: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)
(: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)
@@
-145,14
+144,13
@@
supports takes advantage of this optimization."
#+sbcl
(setq *type-conversion-list*
'((* . *) (:void . sb-alien:void)
#+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))
(: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)
(: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)
@@
-288,3
+286,9
@@
supports takes advantage of this optimization."
((and (eq (car result) :pointer) (eq context :allocation) :pointer))
(t result))))
((and (eq (car result) :pointer) (eq context :allocation) :pointer))
(t result))))
+
+(defun make-lisp-name (name)
+ (let ((converted (substitute #\- #\_ name)))
+ (intern
+ #+case-sensitive converted
+ #-case-sensitive (string-upcase converted))))