summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ffi.c135
-rw-r--r--tests/017/ffi-misc.expected0
-rw-r--r--tests/017/ffi-misc.tl11
3 files changed, 110 insertions, 36 deletions
diff --git a/ffi.c b/ffi.c
index c3f83f26..ae479e98 100644
--- a/ffi.c
+++ b/ffi.c
@@ -411,22 +411,34 @@ static mem_t *ffi_fixed_alloc(struct txr_ffi_type *tft, val obj, val self)
static cnum ffi_varray_dynsize(struct txr_ffi_type *tft, val obj, val self)
{
- cnum len = c_num(length(obj)) + tft->null_term;
- val eltype = tft->eltype;
- struct txr_ffi_type *etft = ffi_type_struct(eltype);
- if (etft->incomplete)
- uw_throwf(error_s, lit("~a: incomplete type array element"), self, nao);
- if (INT_PTR_MAX / etft->size < len)
- uw_throwf(error_s, lit("~a: array too large"), self, nao);
- return len * etft->size;
+ switch (tft->ch_conv) {
+ case conv_char:
+ case conv_zchar:
+ return utf8_to_buf(0, c_str(obj), tft->null_term);
+ case conv_wchar:
+ case conv_bchar:
+ case conv_none:
+ default:
+ {
+ cnum len = c_num(length(obj)) + tft->null_term;
+ val eltype = tft->eltype;
+ struct txr_ffi_type *etft = ffi_type_struct(eltype);
+ if (etft->incomplete)
+ uw_throwf(error_s, lit("~a: incomplete type array element"), self, nao);
+ if (INT_PTR_MAX / etft->size < len)
+ uw_throwf(error_s, lit("~a: array too large"), self, nao);
+ return len * etft->size;
+ }
+ }
}
static mem_t *ffi_varray_alloc(struct txr_ffi_type *tft, val obj, val self)
{
- cnum len = c_num(length(obj)) + tft->null_term;
- val eltype = tft->eltype;
- struct txr_ffi_type *etft = ffi_type_struct(eltype);
- return chk_calloc(len, etft->size);
+ cnum dynsize = ffi_varray_dynsize(tft, obj, self);
+ size_t size = dynsize;
+ if (size != dynsize)
+ uw_throwf(error_s, lit("~a: array too large"), self, nao);
+ return chk_calloc(size, 1);
}
static cnum ffi_flex_dynsize(struct txr_ffi_type *tft, val obj, val self)
@@ -2567,52 +2579,103 @@ static void ffi_array_release(struct txr_ffi_type *tft, val vec, mem_t *dst)
static void ffi_varray_put(struct txr_ffi_type *tft, val vec, mem_t *dst,
val self)
{
- cnum nelem = c_num(length(vec)) + tft->null_term;
- ffi_array_put_common(tft, vec, dst, self, nelem);
+ struct txr_ffi_type *etft = ffi_type_struct(tft->eltype);
+ cnum nelem = ffi_varray_dynsize(tft, vec, self) / etft->size;
+
+ if (tft->ch_conv != conv_none && stringp(vec)) {
+ switch (tft->ch_conv) {
+ case conv_char:
+ case conv_zchar:
+ ffi_char_array_put(tft, vec, dst, nelem);
+ break;
+ case conv_wchar:
+ ffi_wchar_array_put(tft, vec, dst, nelem);
+ break;
+ case conv_bchar:
+ ffi_bchar_array_put(tft, vec, dst, nelem, self);
+ break;
+ case conv_none:
+ /* notreached */
+ break;
+ }
+ } else {
+ ffi_array_put_common(tft, vec, dst, self, nelem);
+ }
}
static val ffi_varray_in(struct txr_ffi_type *tft, int copy, mem_t *src,
val vec, val self)
{
if (copy && vec) {
- cnum nelem = c_num(length(vec)) + tft->null_term;
+ struct txr_ffi_type *etft = ffi_type_struct(tft->eltype);
+ cnum nelem = ffi_varray_dynsize(tft, vec, self) / etft->size;
+
+ switch (tft->ch_conv) {
+ case conv_char:
+ {
+ val str = ffi_char_array_get(tft, src, nelem);
+ return if3(vec, replace(vec, str, zero, t), str);
+ }
+ case conv_zchar:
+ {
+ val str = ffi_zchar_array_get(tft, src, nelem);
+ return if3(vec, replace(vec, str, zero, t), str);
+ }
+ case conv_wchar:
+ {
+ val str = ffi_wchar_array_get(tft, src, nelem);
+ return if3(vec, replace(vec, str, zero, t), str);
+ }
+ case conv_bchar:
+ {
+ val str = ffi_bchar_array_get(tft, src, nelem);
+ return if3(vec, replace(vec, str, zero, t), str);
+ }
+ case conv_none:
+ break;
+ }
return ffi_array_in_common(tft, copy, src, vec, self, nelem);
}
+
return vec;
}
static val ffi_varray_null_term_in(struct txr_ffi_type *tft, int copy, mem_t *src,
val vec_in, val self)
{
- val vec = vector(zero, nil);
- val eltype = tft->eltype;
- struct txr_ffi_type *etft = ffi_type_struct(eltype);
- cnum elsize = etft->size;
- cnum offs, i;
- cnum nelem_orig = c_num(length(vec_in));
+ if (tft->ch_conv != conv_none) {
+ return ffi_varray_in(tft, copy, src, vec_in, self);
+ } else {
+ val vec = vector(zero, nil);
+ val eltype = tft->eltype;
+ struct txr_ffi_type *etft = ffi_type_struct(eltype);
+ cnum elsize = etft->size;
+ cnum offs, i;
+ cnum nelem_orig = c_num(length(vec_in));
+
+ for (i = 0, offs = 0; ; i++) {
+ mem_t *el = src + offs, *p;
- for (i = 0, offs = 0; ; i++) {
- mem_t *el = src + offs, *p;
+ for (p = el; p < el + elsize; p++)
+ if (*p)
+ break;
- for (p = el; p < el + elsize; p++)
- if (*p)
+ if (p == el + elsize)
break;
- if (p == el + elsize)
- break;
+ if (etft->in != 0 && i < nelem_orig) {
+ val elval = ref(vec_in, num_fast(i));
+ vec_push(vec, etft->in(etft, copy, src + offs, elval, self));
+ } else if (copy) {
+ val elval = etft->get(etft, src + offs, self);
+ vec_push(vec, elval);
+ }
- if (etft->in != 0 && i < nelem_orig) {
- val elval = ref(vec_in, num_fast(i));
- vec_push(vec, etft->in(etft, copy, src + offs, elval, self));
- } else if (copy) {
- val elval = etft->get(etft, src + offs, self);
- vec_push(vec, elval);
+ offs += elsize;
}
- offs += elsize;
+ return if3(vec_in, replace(vec_in, vec, zero, t), vec);
}
-
- return if3(vec_in, replace(vec_in, vec, zero, t), vec);
}
static val ffi_varray_null_term_get(struct txr_ffi_type *tft, mem_t *src,
diff --git a/tests/017/ffi-misc.expected b/tests/017/ffi-misc.expected
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/tests/017/ffi-misc.expected
diff --git a/tests/017/ffi-misc.tl b/tests/017/ffi-misc.tl
new file mode 100644
index 00000000..1578cd2c
--- /dev/null
+++ b/tests/017/ffi-misc.tl
@@ -0,0 +1,11 @@
+(load "../common")
+
+(defvarl ar (ffi (array char)))
+
+(defvarl zar (ffi (zarray char)))
+
+(test (ffi-put "\x1234@@@" ar) #b'e188b4404040')
+
+(test (ffi-put "\x1234@@@" zar) #b'e188b440404000')
+
+(test (ffi-get (ffi-put "\x1234@@@" zar) zar) "\x1234@@@")
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-10 03:14:24 +0000