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

Bugfixes for bytevector

Browse source
This commit is contained in:
Justin Ethier 2016-03-23 20:48:25 -04:00
parent d184df6b4e
commit 79101a2194
1 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
runtime.c
View file

@ -593,7 +593,7 @@ object Cyc_display(object x, FILE *port)
if (i > 0) { if (i > 0) {
fprintf(port, " "); fprintf(port, " ");
} }
fprintf(port, "%d", (int)(((bytevector)x)->data[i])); fprintf(port, "%u", (int)(((bytevector)x)->data[i]));
} }
fprintf(port, ")"); fprintf(port, ")");
break; break;
@ -1392,7 +1392,33 @@ object Cyc_make_bytevector(void *data, object cont, int argc, object len, ...) {
return_closcall1(data, cont, bv); return_closcall1(data, cont, bv);
} }
object Cyc_bytevector(void *data, object cont, int argc, object bval, ...) { #define Cyc_bytevector_va_list(argc) { \
int i = 0, val; \
va_list ap; \
object tmp; \
char *buffer; \
make_empty_bytevector(bv); \
if (argc > 0) { \
Cyc_check_int(data, bval); \
buffer = alloca(sizeof(char) * argc); \
val = obj_is_int(bval) ? obj_obj2int(bval) : integer_value(bval); \
buffer[i] = val; \
va_start(ap, bval); \
for(i = 1; i < argc; i++) { \
tmp = va_arg(ap, object); \
Cyc_check_int(data, tmp); \
val = obj_is_int(tmp) ? obj_obj2int(tmp) : integer_value(tmp); \
buffer[i] = val; \
} \
va_end(ap); \
bv.len = argc; \
bv.data = buffer; \
} \
return_closcall1(data, cont, &bv); \
}
void dispatch_bytevector(void *data, int _argc, object clo, object cont, object bval, ...) {
int argc = _argc - 1;
int i = 0, val; int i = 0, val;
va_list ap; va_list ap;
object tmp; object tmp;
@ -1411,13 +1437,20 @@ object Cyc_bytevector(void *data, object cont, int argc, object bval, ...) {
buffer[i] = val; buffer[i] = val;
} }
va_end(ap); va_end(ap);
bv.len = argc;
bv.data = buffer;
} }
return_closcall1(data, cont, &bv); return_closcall1(data, cont, &bv);
} }
object Cyc_bytevector(void *data, object cont, int _argc, object bval, ...) {
Cyc_bytevector_va_list(_argc);
}
object Cyc_bytevector_u8_ref(void *data, object bv, object k) { object Cyc_bytevector_u8_ref(void *data, object bv, object k) {
const char *buf; const char *buf;
int idx, val; int idx;
unsigned int val;
Cyc_check_bvec(data, bv); Cyc_check_bvec(data, bv);
Cyc_check_int(data, k); Cyc_check_int(data, k);
@ -1446,7 +1479,7 @@ object Cyc_bytevector_u8_set(void *data, object bv, object k, object b) {
len = ((bytevector)bv)->len; len = ((bytevector)bv)->len;
Cyc_check_bounds(data, "bytevector-u8-set!", len, idx); Cyc_check_bounds(data, "bytevector-u8-set!", len, idx);
buf[idx] = obj_obj2int(b); buf[idx] = (unsigned char)(obj_obj2int(b));
return bv; return bv;
} }
@ -1921,7 +1954,8 @@ void _bytevector_91u8_91set_67(void *data, object cont, object args) {
return_closcall1(data, cont, bv); }} return_closcall1(data, cont, bv); }}
void _bytevector(void *data, object cont, object args) { void _bytevector(void *data, object cont, object args) {
return_closcall1(data, cont, boolean_f); } // TODO object argc = Cyc_length(data, args);
dispatch(data, obj_obj2int(argc), (function_type)dispatch_bytevector, cont, cont, args); }
void _vector_91length(void *data, object cont, object args){ void _vector_91length(void *data, object cont, object args){
Cyc_check_num_args(data, "vector_91length", 1, args); Cyc_check_num_args(data, "vector_91length", 1, args);