-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: ANSI-Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Feb 2002
;;;;
-;;;; $Id: primitives.cl,v 1.7 2002/03/16 22:54:06 kevin Exp $
+;;;; $Id: primitives.cl,v 1.10 2002/03/18 22:47:57 kevin Exp $
;;;;
;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
)
(defmacro null-char-p (val)
- `(if (or (eql ,val 0)
- (eq ,val #\Null))
- t
- nil))
-
-(defmacro ensure-char (val)
- `(etypecase ,val
- (integer
- (code-char ,val))
- (character
- ,val)))
+ "Returns T if character is NULL"
+ `(zerop ,val))
(defmacro def-foreign-type (name type)
#+lispworks `(fli:define-c-typedef ,name ,(convert-from-uffi-type type :type))
(:char . c-call:char)
(:unsigned-char . (alien:unsigned 8))
(:byte . (alien:unsigned 8))
- (:short . c-call:unsigned-short) (:unsigned-short c-call:unsigned-short)
+ (:short . c-call:unsigned-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)
(:float . c-call:float) (:double . c-call:double)
'((* . *) (:void . :void)
(:short . :short)
(:pointer-void . (* :void))
- (:cstring . (* :char))
+ (:cstring . (* :unsigned-char))
(:char . :char)
(:unsigned-char . :unsigned-char)
(:byte . :byte)
(defconstant +type-conversion-list+
'((* . :pointer) (:void . :void)
(:short . :short)
- (:pointer-void . (:pointer :void))
- (:cstring . (:pointer :char))
- (:char . :char)
+ (:pointer-void . (:pointer :unsigned :void))
+ (:cstring . (:pointer (:unsigned :char)))
+ (:char . :char)
+ (:byte :byte)
(:unsigned-char . (:unsigned :char))
(:int . :int) (:unsigned-int . (:unsigned :int))
(:long . :long) (:unsigned-long . (:unsigned :long))