mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 00:30:21 +02:00
Simplify the (system foreign) API.
Suggested by Neil Jerram. * libguile/foreign.h (SCM_FOREIGN_TYPE, SCM_FOREIGN_VALUE_REF, SCM_FOREIGN_VALUE_SET, SCM_FOREIGN_LEN, SCM_FOREIGN_TYPED_P, SCM_FOREIGN_VALUE_P, SCM_VALIDATE_FOREIGN_VALUE, scm_foreign_set_x, scm_foreign_type): Remove. (scm_foreign_ref): Rename to... (scm_foreign_address): ... this. (scm_take_foreign_pointer): Update. (SCM_FOREIGN_POINTER): Remove CTYPE argument. Update callers. (scm_make_pointer): New declaration. * libguile/foreign.c (scm_to_uintptr, scm_from_uintptr): New macros. (scm_make_pointer): New function. (scm_take_foreign_pointer): Remove TYPE and LEN arguments. Update callers. (scm_foreign_ref): Remove to... (scm_foreign_address): ... this. Remove type-related code. (scm_foreign_set_x): Remove. (scm_foreign_to_bytevector): Change argument order; make LEN argument compulsory. (scm_i_foreign_print): Remove type printing. (unpack): Remove foreign-type checking. * libguile/deprecated.c (scm_dynamic_args_call): Update accordingly. * libguile/dynl.c (scm_dynamic_pointer): Remove the TYPE and LEN arguments; update callers. Update to the new foreign API. * libguile/dynl.h (scm_dynamic_pointer): Update. * libguile/gsubr.c (create_gsubr): Update to the new foreign API. * libguile/gsubr.h (SCM_SUBRF, SCM_SUBR_GENERIC): Ditto. * libguile/snarf.h (SCM_IMMUTABLE_FOREIGN): Ditto. * libguile/vm-i-system.c (subr_call): Ditto. * module/system/foreign.scm (null-pointer?): New procedure. * test-suite/standalone/test-ffi: Update to the new `bytevector->foreign' signature. * test-suite/tests/foreign.test ("null pointer")["null pointer identity", "null-pointer? %null-pointer"]: New tests. ["foreign-set! other-null-pointer", "foreign->bytevector other-null-pointer"]: Remove. ("make-pointer", "foreign<->bytevector"): New test prefixes.
This commit is contained in:
parent
1af772303b
commit
d4149a510e
12 changed files with 176 additions and 307 deletions
|
@ -25,11 +25,14 @@
|
|||
uint16 int16
|
||||
uint32 int32
|
||||
uint64 int64
|
||||
%null-pointer
|
||||
|
||||
sizeof alignof
|
||||
|
||||
foreign-ref foreign-set!
|
||||
%null-pointer
|
||||
null-pointer?
|
||||
make-pointer
|
||||
foreign-address
|
||||
|
||||
foreign->bytevector bytevector->foreign
|
||||
foreign-set-finalizer!
|
||||
make-foreign-function
|
||||
|
@ -38,6 +41,20 @@
|
|||
(load-extension (string-append "libguile-" (effective-version))
|
||||
"scm_init_foreign")
|
||||
|
||||
|
||||
;;;
|
||||
;;; Pointers.
|
||||
;;;
|
||||
|
||||
(define (null-pointer? pointer)
|
||||
(= (foreign-address pointer) 0))
|
||||
|
||||
|
||||
|
||||
;;;
|
||||
;;; Structures.
|
||||
;;;
|
||||
|
||||
(define *writers*
|
||||
`((,float . ,bytevector-ieee-single-native-set!)
|
||||
(,double . ,bytevector-ieee-double-native-set!)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue