Changeset 14435

Timestamp:

Nov 18, 2010, 2:07:49 PM (14 years ago)

Author:

Gary Byers

Message:

Treat some intrinsic types (LONG-FLOAT, etc.) as if they were small
foreign arrays. This isn't quite right - alignment constraints may
differ and this doesn't really define those types in a usable way,
but hopefully this fixes ticket:781.

Even though the structures FFI-STRUCT and FFI-UNION intentionally
have the same layout, assuming this might lead to street crime, as
some unsolicited typechecking helpfully pointed out ...

File:

• trunk/source/lib/db-io.lisp (modified) (3 diffs)

trunk/source/lib/db-io.lisp

@@ -1322 +1322 @@
            (:signed `(,encoded-type-signed-32))
            (:unsigned `(,encoded-type-unsigned-32))
-           ((:long-double :complex-int
-                        :complex-float :complex-double :complex-long-double)
-            (encode-ffi-type `(:struct ,primtype))))
+           ((:long-float :long-double) (encode-ffi-type '(:array 2 (:primitive :double))))
+           (:complex-int (encode-ffi-type '(:array 2 (:primitive :signed))))
+           (:complex-float (encode-ffi-type '(:array 2 (:primitive :float))))
+           (:complex-double (encode-ffi-type '(:array 2 (:primitive :double))))
+           (:complex-long-double (encode-ffi-type '(:array 4 (:primitive :double)))))
          (ecase (car primtype)
            (* `(,encoded-type-pointer ,@(encode-ffi-type
@@ -1396 +1398 @@
            (:unsigned `(f))
            ((:long-double :complex-int
-                          :complex-float :complex-double :complex-long-double)            
+                          :complex-float :complex-double :complex-long-double)
             #|(encode-ffi-arg-type `(:struct ,primtype))|#
             `(#\?)))
@@ -1428 +1430 @@
           (:union #\u)
           (:transparent-union #\U))
-           ,@(encode-name (ffi-struct-reference (cadr spec)))))
+           ,@(encode-name
+              (if (eq (car spec) :struct)
+                (ffi-struct-reference (cadr spec))
+                (ffi-union-reference (cadr spec))))))
     (:typedef
      `(#\t ,@(encode-name (ffi-typedef-name (cadr spec)))))