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

Removed old functions

Browse source
This commit is contained in:
Justin Ethier 2020-01-20 12:14:04 -05:00
parent cc16d6ca49
commit d96eb5d6f7
2 changed files with 81 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/cyclone/runtime.h
View file

@ -489,8 +489,8 @@ object Cyc_vector_length(void *data, object v);
object Cyc_vector_ref(void *d, object v, object k); object Cyc_vector_ref(void *d, object v, object k);
#define Cyc_vector_ref_unsafe(d, v, k) \ #define Cyc_vector_ref_unsafe(d, v, k) \
((vector) v)->elements[obj_obj2int(k)] ((vector) v)->elements[obj_obj2int(k)]
object Cyc_vector_set(void *d, object v, object k, object obj); //object Cyc_vector_set(void *d, object v, object k, object obj);
object Cyc_vector_set_unsafe(void *d, object v, object k, object obj); //object Cyc_vector_set_unsafe(void *d, object v, object k, object obj);
object Cyc_vector_set2(void *d, object cont, object v, object k, object obj); object Cyc_vector_set2(void *d, object cont, object v, object k, object obj);
object Cyc_vector_set_unsafe2(void *d, object cont, object v, object k, object obj); object Cyc_vector_set_unsafe2(void *d, object cont, object v, object k, object obj);
object Cyc_make_vector(void *data, object cont, int argc, object len, ...); object Cyc_make_vector(void *data, object cont, int argc, object len, ...);
@ -837,8 +837,8 @@ static inline object Cyc_cdr(void *data, object lis)
list malloc_make_pair(object, object); list malloc_make_pair(object, object);
object Cyc_set_cell(void *, object l, object val); object Cyc_set_cell(void *, object l, object val);
object Cyc_set_car(void *, object l, object val); //object Cyc_set_car(void *, object l, object val);
object Cyc_set_cdr(void *, object l, object val); //object Cyc_set_cdr(void *, object l, object val);
object Cyc_set_car2(void *, object cont, object l, object val); object Cyc_set_car2(void *, object cont, object l, object val);
object Cyc_set_cdr2(void *, object cont, object l, object val); object Cyc_set_cdr2(void *, object cont, object l, object val);
object Cyc_length(void *d, object l); object Cyc_length(void *d, object l);

132
runtime.c
View file

@ -1989,66 +1989,83 @@ object Cyc_set_cell(void *data, object l, object val)
return l; return l;
} }
object Cyc_set_car(void *data, object l, object val) //object Cyc_set_car(void *data, object l, object val)
{ //{
if (Cyc_is_pair(l) == boolean_f) { // if (Cyc_is_pair(l) == boolean_f) {
Cyc_invalid_type_error(data, pair_tag, l); // Cyc_invalid_type_error(data, pair_tag, l);
} // }
Cyc_verify_mutable(data, l); // Cyc_verify_mutable(data, l);
gc_mut_update((gc_thread_data *) data, car(l), val); // gc_mut_update((gc_thread_data *) data, car(l), val);
car(l) = val; // car(l) = val;
add_mutation(data, l, -1, val); // add_mutation(data, l, -1, val);
return l; // return l;
} //}
//
//object Cyc_set_cdr(void *data, object l, object val)
//{
// if (Cyc_is_pair(l) == boolean_f) {
// Cyc_invalid_type_error(data, pair_tag, l);
// }
// Cyc_verify_mutable(data, l);
// gc_mut_update((gc_thread_data *) data, cdr(l), val);
// cdr(l) = val;
// add_mutation(data, l, -1, val);
// return l;
//}
//
//object Cyc_vector_set(void *data, object v, object k, object obj)
//{
// int idx;
// Cyc_check_vec(data, v);
// Cyc_check_fixnum(data, k);
// Cyc_verify_mutable(data, v);
// idx = unbox_number(k);
//
// if (idx < 0 || idx >= ((vector) v)->num_elements) {
// Cyc_rt_raise2(data, "vector-set! - invalid index", k);
// }
//
// gc_mut_update((gc_thread_data *) data, ((vector) v)->elements[idx], obj);
//
// ((vector) v)->elements[idx] = obj;
// add_mutation(data, v, idx, obj);
// return v;
//}
//
//object Cyc_vector_set_unsafe(void *data, object v, object k, object obj)
//{
// int idx = unbox_number(k);
// gc_mut_update((gc_thread_data *) data, ((vector) v)->elements[idx], obj);
// ((vector) v)->elements[idx] = obj;
// add_mutation(data, v, idx, obj);
// return v;
//}
object Cyc_set_cdr(void *data, object l, object val)
{
if (Cyc_is_pair(l) == boolean_f) {
Cyc_invalid_type_error(data, pair_tag, l);
}
Cyc_verify_mutable(data, l);
gc_mut_update((gc_thread_data *) data, cdr(l), val);
cdr(l) = val;
add_mutation(data, l, -1, val);
return l;
}
object Cyc_vector_set(void *data, object v, object k, object obj)
{
int idx;
Cyc_check_vec(data, v);
Cyc_check_fixnum(data, k);
Cyc_verify_mutable(data, v);
idx = unbox_number(k);
if (idx < 0 || idx >= ((vector) v)->num_elements) {
Cyc_rt_raise2(data, "vector-set! - invalid index", k);
}
gc_mut_update((gc_thread_data *) data, ((vector) v)->elements[idx], obj);
((vector) v)->elements[idx] = obj;
add_mutation(data, v, idx, obj);
return v;
}
object Cyc_vector_set_unsafe(void *data, object v, object k, object obj)
{
int idx = unbox_number(k);
gc_mut_update((gc_thread_data *) data, ((vector) v)->elements[idx], obj);
((vector) v)->elements[idx] = obj;
add_mutation(data, v, idx, obj);
return v;
}
object Cyc_set_car2(void *data, object cont, object l, object val) object Cyc_set_car2(void *data, object cont, object l, object val)
{ {
if (Cyc_is_pair(l) == boolean_f) { if (Cyc_is_pair(l) == boolean_f) {
Cyc_invalid_type_error(data, pair_tag, l); Cyc_invalid_type_error(data, pair_tag, l);
} }
Cyc_verify_mutable(data, l); Cyc_verify_mutable(data, l);
// // Alternate write barrier
// object result = share_object(data, l, val);
// if (result != NULL) {
// if (result == boolean_f) {
// // TODO: Initiate minor GC
// object buf[2]; buf[0] = l; buf[1] = val;
// // TODO: allocate closure to call set_car2 again.
// // TODO: where to stuff cont?
// GC(data, TODO, buf, 2);
// } else {
// // val was copied to the heap
// val = result;
// }
// }
gc_mut_update((gc_thread_data *) data, car(l), val); gc_mut_update((gc_thread_data *) data, car(l), val);
car(l) = val; car(l) = val;
add_mutation(data, l, -1, val); //add_mutation(data, l, -1, val); // Obsoleted by new WB
_return_closcall1(data, cont, l); _return_closcall1(data, cont, l);
} }
@ -4786,14 +4803,18 @@ void _null_127(void *data, object cont, object args)
void _set_91car_67(void *data, object cont, object args) void _set_91car_67(void *data, object cont, object args)
{ {
//Cyc_check_num_args(data, "set-car!", 2, args);
//return_closcall1(data, cont, Cyc_set_car(data, car(args), cadr(args)));
Cyc_check_num_args(data, "set-car!", 2, args); Cyc_check_num_args(data, "set-car!", 2, args);
return_closcall1(data, cont, Cyc_set_car(data, car(args), cadr(args))); Cyc_set_car2(data, cont, car(args), cadr(args));
} }
void _set_91cdr_67(void *data, object cont, object args) void _set_91cdr_67(void *data, object cont, object args)
{ {
//Cyc_check_num_args(data, "set-cdr!", 2, args);
//return_closcall1(data, cont, Cyc_set_cdr(data, car(args), cadr(args)));
Cyc_check_num_args(data, "set-cdr!", 2, args); Cyc_check_num_args(data, "set-cdr!", 2, args);
return_closcall1(data, cont, Cyc_set_cdr(data, car(args), cadr(args))); Cyc_set_cdr2(data, cont, car(args), cadr(args));
} }
void _Cyc_91has_91cycle_127(void *data, object cont, object args) void _Cyc_91has_91cycle_127(void *data, object cont, object args)
@ -5213,8 +5234,9 @@ void _vector_91set_67(void *data, object cont, object args)
{ {
Cyc_check_num_args(data, "vector-set!", 3, args); Cyc_check_num_args(data, "vector-set!", 3, args);
{ {
object ref = Cyc_vector_set(data, car(args), cadr(args), caddr(args)); //object ref = Cyc_vector_set(data, car(args), cadr(args), caddr(args));
return_closcall1(data, cont, ref); //return_closcall1(data, cont, ref);
Cyc_vector_set2(data, cont, car(args), cadr(args), caddr(args));
}} }}
void _list_91_125vector(void *data, object cont, object args) void _list_91_125vector(void *data, object cont, object args)