From 16b390a2d811bb0dbe6f8d8bf1cf21cb397d3447 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 6 Jun 2021 17:58:06 -0700 Subject: ffi: allow conversion of carray objects under cptr. * ffi.c (ffi_cptr_put): If the object is not a cptr, try it as a carray. This requires the tft to have an eltype, requiring a change in ffi_type_compile. (ffi_type_compile): When compiling a parametrized cptr object, we now look up the type symbol as a FFI type, and store the result as the tft->eltype. If the symbol is not an FFI type, then this lookup returns nil. If the eltype is non-nil, then there is the possibility it can match the element type of a carray. * txr.1: Documented. --- ffi.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'ffi.c') diff --git a/ffi.c b/ffi.c index 7c001187..9a104547 100644 --- a/ffi.c +++ b/ffi.c @@ -1901,10 +1901,16 @@ static val ffi_bool_rget(struct txr_ffi_type *tft, mem_t *src, val self) #endif -static void ffi_cptr_put(struct txr_ffi_type *tft, val n, mem_t *dst, +static void ffi_cptr_put(struct txr_ffi_type *tft, val ptr, mem_t *dst, val self) { - mem_t *p = cptr_handle(n, tft->tag, self); + mem_t *p = 0; + + if (type(ptr) == CPTR) + p = cptr_handle(ptr, tft->tag, self); + else + p = carray_ptr(ptr, tft->eltype, self); + *coerce(mem_t **, dst) = p; } @@ -3932,6 +3938,7 @@ val ffi_type_compile(val syntax) tft->alloc = ffi_cptr_alloc; tft->free = ffi_noop_free; tft->tag = tag; + tft->eltype = gethash(ffi_typedef_hash, tag); if (cddr(syntax)) goto excess; return type; -- cgit v1.2.3