Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-15 16:57:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added UTF-8 support to list->string

Browse source
This commit is contained in:
Justin Ethier 2017-10-27 12:44:06 +00:00
parent 77e391cabc
commit 4a77296ddf
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
runtime.c
View file

@ -1835,21 +1835,34 @@ object Cyc_string2symbol(void *data, object str)
object Cyc_list2string(void *data, object cont, object lst) object Cyc_list2string(void *data, object cont, object lst)
{ {
char *buf; char *buf, cbuf[5];
int i = 0; int i = 0, len = 0;
object len; object cbox, tmp = lst;
char_type ch;
Cyc_check_pair_or_null(data, lst); Cyc_check_pair_or_null(data, lst);
len = Cyc_length(data, lst); // Inefficient, walks whole list
// Need to walk the list of chars to compute multibyte length
while (tmp) {
if (is_value_type(tmp) || ((list) tmp)->tag != pair_tag) {
Cyc_rt_raise2(data, "length - invalid parameter, expected list", tmp);
}
cbox = car(tmp);
ch = obj_obj2char(cbox);
if (!obj_is_char(cbox)) {
Cyc_rt_raise2(data, "Expected character but received", cbox);
}
len += Cyc_utf8_encode_char(cbuf, 5, ch);
tmp = cdr(tmp);
}
{ {
make_string_noalloc(str, NULL, (obj_obj2int(len))); make_string_noalloc(str, NULL, len);
str.str = buf = alloca(sizeof(char) * (obj_obj2int(len) + 1)); str.str = buf = alloca(sizeof(char) * (len + 1));
while ((lst != NULL)) { while ((lst != NULL)) {
if (!obj_is_char(car(lst))) { cbox = car(lst);
Cyc_rt_raise2(data, "Expected character but received", car(lst)); ch = obj_obj2char(cbox); // Already validated, can assume chars now
} i += Cyc_utf8_encode_char(&(buf[i]), 5, ch);
buf[i++] = obj_obj2char(car(lst));
lst = cdr(lst); lst = cdr(lst);
} }
buf[i] = '\0'; buf[i] = '\0';