mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-22 20:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity

ffi: coerce to base strings automatically in ecl_null_terminated_base_string

Browse source 
Don't coerce symbols to strings, since this would be inconsistent
    with the rest of the ffi interface. Fixes #338. Also fix bad type
    checks.
This commit is contained in:
Marius Gerbershagen 2018-05-11 22:29:25 +02:00
parent 4cddf5b466
commit f75a43139b
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/c/ffi.d
View file

@ -213,8 +213,9 @@ char *
ecl_base_string_pointer_safe(cl_object f)
{
unsigned char *s;
/* FIXME! Is there a better function name? */
f = ecl_check_cl_type(@'si::make-foreign-data-from-array', f, t_base_string);
if (ecl_unlikely(!ECL_BASE_STRING_P(f))) {
FEwrong_type_argument(@[base-string], f);
}
s = f->base_string.self;
if (ecl_unlikely(ECL_ARRAY_HAS_FILL_POINTER_P(f) &&
s[f->base_string.fillp] != 0)) {
@ -226,13 +227,18 @@ ecl_base_string_pointer_safe(cl_object f)
cl_object
ecl_null_terminated_base_string(cl_object f)
{
/* FIXME! Is there a better function name? */
f = ecl_check_cl_type(@'si::make-foreign-data-from-array', f, t_base_string);
if (ECL_ARRAY_HAS_FILL_POINTER_P(f) &&
f->base_string.self[f->base_string.fillp] != 0) {
return cl_copy_seq(f);
if (ecl_unlikely(!ECL_STRINGP(f))) {
FEwrong_type_argument(@[string], f);
}
if (ecl_t_of(f) == t_base_string) {
if (ECL_ARRAY_HAS_FILL_POINTER_P(f) &&
f->base_string.self[f->base_string.fillp] != 0) {
return cl_copy_seq(f);
} else {
return f;
}
} else {
return f;
return si_copy_to_simple_base_string(f);
}
}