Changeset 34 for trunk/init

Timestamp:

03/11/08 01:34:13 (8 months ago)

Author:

lhealy

Message:

The classes/types in the different contexts are now gathered together
in one place, in *type-names* for the types and in *data-class-name*
for data classes, populated by #'add-data-class. Both defdata and
defmfun-all use the table and so mapping between various names is
consistent. The data class names are now different, *-double-float
and *-single-float replaces *-double and *-single. The regression
tests give the same results as before.

Location:

trunk/init

Files:

• init.lisp (modified) (2 diffs)
• number-conversion.lisp (modified) (2 diffs)
• utility.lisp (deleted)

trunk/init/init.lisp

@@ -1 +1 @@
 ;; Load GSL
 ;; Liam Healy Sat Mar  4 2006 - 18:53
-;; Time-stamp: <2008-02-25 19:31:49EST init.lisp>
+;; Time-stamp: <2008-03-09 12:30:38EDT init.lisp>
 ;; $Id$
 
@@ -21 +21 @@
    
 (cffi:use-foreign-library libgsl)
-
-;;; The following define :size, from cffi-unix which became cffi-net,
-;;; which is apparently turning into something even bigger and more
-;;; irrelevant.  All we need is the definition of :size.  This is
-;;; not in the keyword package to suppress warnings from CFFI.
-
-(cffi:defctype uint32 :unsigned-int)
-(cffi:defctype uint64 :unsigned-long)
-(cffi:defctype gsll::size
-   #-cffi-features:no-long-long uint64
-   #+cffi-features:no-long-long
-   #.(progn (cerror "Use uint32 instead."
-   "This platform does not support long long types.")
-   uint32))

trunk/init/number-conversion.lisp

@@ -1 +1 @@
 ;; Conversion of numbers C->CL
 ;; Liam Healy, Sun May 28 2006 - 22:04
-;; Time-stamp: <2008-02-17 18:54:32EST number-conversion.lisp>
+;; Time-stamp: <2008-03-09 14:17:34EDT number-conversion.lisp>
 ;; $Id$
 
@@ -71 +71 @@
     (t `((,(cl-convert-function (st-type decl)) ,(st-symbol decl))))))
 
+;;;;****************************************************************************
+;;;; Types
+;;;;****************************************************************************
+
+;;; CL type definitions:
+(deftype unsigned-byte8 () '(unsigned-byte 8))
+(deftype unsigned-byte16 () '(unsigned-byte 16))
+(deftype unsigned-byte32 () '(unsigned-byte 32))
+(deftype unsigned-byte64 () '(unsigned-byte 64))
+
+;;; C type definitions from cffi-net/unixint.cffi.lisp:
+(cffi:defctype uint8 :unsigned-char)
+(cffi:defctype uint16 :unsigned-short)
+(cffi:defctype uint32 :unsigned-int)
+(cffi:defctype uint64 :unsigned-long)
+(cffi:defctype int8 :char)
+(cffi:defctype int16 :short)
+(cffi:defctype int32 :int)
+(cffi:defctype int64 :long)
+
+#-cffi-features:no-long-long
+(cffi:defctype size uint64)
+
+#+cffi-features:no-long-long
+(progn (cerror "Use :uint32 instead." "This platform does not support long long types.")
+       (cffi:defctype size uint32))
+
+;;;(deftype unsigned-fixnum () `(integer 0 ,most-positive-fixnum))
+
+(defparameter *type-names*
+  '(
+    (fixnum :int "_int")
+    (unsigned-fixnum :unsigned-int "_uint")
+    (single-float :float "_float")
+    (double-float :double "")
+    ;;(long-double :long "_long_double")
+    (complex gsl-complex "_complex")
+    (t nil ""))
+  "A list of type name mappings, each being a list
+   Lisp type, C type as CFFI understands it, and GSL
+   splice string.")
+
+(defun lookup-splice-name (cl-type)
+  (third (find cl-type *type-names* :key #'first)))
+
+(defun lookup-C-type (cl-type)
+  (second (find cl-type *type-names* :key #'first)))
+
+(defun splice-name (base-name keyword symbol)
+  "Make a new C name for a data function from a base name." 
+  (let* ((insert (+ (search keyword base-name) (length keyword))))
+    (concatenate 'string
+                 (subseq base-name 0 insert)
+                 (lookup-splice-name symbol)
+                 (subseq base-name insert))))