Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-24 04:25:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP

Browse source
This commit is contained in:
Justin Ethier 2017-10-27 17:18:29 +00:00
parent a5d768a8a4
commit 0bcce5038e
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/cyclone/runtime.h
View file

@ -725,6 +725,7 @@ void Cyc_set_globals_changed(gc_thread_data *thd);
int Cyc_utf8_encode(char *dest, int sz, uint32_t *src, int srcsz); int Cyc_utf8_encode(char *dest, int sz, uint32_t *src, int srcsz);
uint32_t Cyc_utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte); uint32_t Cyc_utf8_decode(uint32_t* state, uint32_t* codep, uint32_t byte);
int Cyc_utf8_count_code_points(uint8_t* s); int Cyc_utf8_count_code_points(uint8_t* s);
int Cyc_utf8_count_code_points_and_bytes(uint8_t* s, int *cpts, int *bytes);
uint32_t Cyc_utf8_validate_stream(uint32_t *state, char *str, size_t len); uint32_t Cyc_utf8_validate_stream(uint32_t *state, char *str, size_t len);
uint32_t Cyc_utf8_validate(char *str, size_t len); uint32_t Cyc_utf8_validate(char *str, size_t len);
/**@}*/ /**@}*/

22
runtime.c
View file

@ -6313,7 +6313,7 @@ object Cyc_io_read_line(void *data, object cont, object port)
{ {
FILE *stream = ((port_type *) port)->fp; FILE *stream = ((port_type *) port)->fp;
char buf[1024]; char buf[1024];
int len; int len, num_cp;
Cyc_check_port(data, port); Cyc_check_port(data, port);
if (stream == NULL) { if (stream == NULL) {
@ -6322,7 +6322,8 @@ object Cyc_io_read_line(void *data, object cont, object port)
set_thread_blocked(data, cont); set_thread_blocked(data, cont);
errno = 0; errno = 0;
if (fgets(buf, 1023, stream) != NULL) { if (fgets(buf, 1023, stream) != NULL) {
len = strlen(buf); // TODO: not good enough for UTF-8, what if we stopped reading in the middle of a code point?
Cyc_utf8_count_code_points_and_bytes((uint8_t *)buf, &num_cp, &len);
{ {
// Remove any trailing CR / newline chars // Remove any trailing CR / newline chars
while (len > 0 && (buf[len - 1] == '\n' || while (len > 0 && (buf[len - 1] == '\n' ||
@ -6331,6 +6332,7 @@ object Cyc_io_read_line(void *data, object cont, object port)
} }
buf[len] = '\0'; buf[len] = '\0';
make_string_noalloc(s, buf, len); make_string_noalloc(s, buf, len);
s.num_cp = num_cp;
return_thread_runnable(data, &s); return_thread_runnable(data, &s);
} }
} else { } else {
@ -6539,6 +6541,22 @@ int Cyc_utf8_count_code_points(uint8_t* s) {
return count; return count;
} }
int Cyc_utf8_count_code_points_and_bytes(uint8_t* s, int *cpts, int *bytes) {
uint32_t codepoint;
uint32_t state = 0;
*cpts = 0;
*bytes = 0;
for (; *s; ++s){
*bytes += 1;
if (!Cyc_utf8_decode(&state, &codepoint, *s))
*cpts += 1;
}
if (state != CYC_UTF8_ACCEPT)
return -1;
return 0;
}
// TODO: index into X codepoint in a string // TODO: index into X codepoint in a string
/** /**