diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-07-26 17:44:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-07-26 19:38:52 +0200 |
| commit | d4149a510e4a87915b625255f4de3301510d810c (patch) | |
| tree | 8145892f76b6eda3ec86f0be752e391913b9a656 /libguile/gsubr.c | |
| parent | 1af772303bf4eafb632a95bf4015a7736275e9e7 (diff) | |
| download | guile-d4149a510e4a87915b625255f4de3301510d810c.tar.gz | |
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.
Diffstat (limited to 'libguile/gsubr.c')
| -rw-r--r-- | libguile/gsubr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index de4bff69f..ed8febd7b 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -794,13 +794,11 @@ create_gsubr (int define, const char *name, sname = scm_from_locale_symbol (name); table = scm_c_make_vector (generic_loc ? 3 : 2, SCM_UNDEFINED); SCM_SIMPLE_VECTOR_SET (table, 0, - scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID, - fcn, 0, NULL)); + scm_take_foreign_pointer (fcn, NULL)); SCM_SIMPLE_VECTOR_SET (table, 1, sname); if (generic_loc) SCM_SIMPLE_VECTOR_SET (table, 2, - scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID, - generic_loc, 0, NULL)); + scm_take_foreign_pointer (generic_loc, NULL)); /* make program */ ret = scm_make_program (scm_subr_objcode_trampoline (nreq, nopt, rest), |