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

Cleanup

Browse source
This commit is contained in:
Justin Ethier 2020-01-29 23:04:58 -05:00
parent 449e4bd425
commit 2569acae64
2 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cyclone/runtime.h
View file

@ -498,8 +498,6 @@ 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_set_cps(void *d, object cont, object v, object k, object obj); object Cyc_vector_set_cps(void *d, object cont, object v, object k, object obj);
object Cyc_vector_set_unsafe_cps(void *d, object cont, object v, object k, object obj); object Cyc_vector_set_unsafe_cps(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_make_vector(void *data, object cont, int argc, object len, ...); object Cyc_make_vector(void *data, object cont, int argc, object len, ...);
/**@}*/ /**@}*/
@ -848,8 +846,6 @@ 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_car_cps(void *, object cont, object l, object val); object Cyc_set_car_cps(void *, object cont, object l, object val);
object Cyc_set_cdr_cps(void *, object cont, object l, object val); object Cyc_set_cdr_cps(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_length(void *d, object l); object Cyc_length(void *d, object l);
object Cyc_length_unsafe(void *d, object l); object Cyc_length_unsafe(void *d, object l);
object Cyc_list2vector(void *data, object cont, object l); object Cyc_list2vector(void *data, object cont, object l);

29
runtime.c
View file

@ -2176,14 +2176,6 @@ object Cyc_vector_set_unsafe(void *data, object v, object k, object obj)
return v; return v;
} }
// JAE TODO: comment below in progress
// TODO: rename these as (EG) Cyc_set_car_cps. Uncomment non-CPS above and we can use them for unsafe compilation
//
object Cyc_set_car2(void *data, object cont, object l, object val)
{
return Cyc_set_car_cps(data, cont, l, val);
}
object Cyc_set_car_cps(void *data, object cont, object l, object val) object Cyc_set_car_cps(void *data, object cont, object l, object val)
{ {
if (Cyc_is_pair(l) == boolean_f) { if (Cyc_is_pair(l) == boolean_f) {
@ -2207,11 +2199,6 @@ object Cyc_set_car_cps(void *data, object cont, object l, object val)
} }
} }
object Cyc_set_cdr2(void *data, object cont, object l, object val)
{
return Cyc_set_cdr_cps(data, cont, l, val);
}
object Cyc_set_cdr_cps(void *data, object cont, object l, object val) object Cyc_set_cdr_cps(void *data, object cont, object l, object val)
{ {
if (Cyc_is_pair(l) == boolean_f) { if (Cyc_is_pair(l) == boolean_f) {
@ -2235,11 +2222,6 @@ object Cyc_set_cdr_cps(void *data, object cont, object l, object val)
} }
} }
object Cyc_vector_set2(void *data, object cont, object v, object k, object obj)
{
return Cyc_vector_set_cps(data, cont, v, k, obj);
}
object Cyc_vector_set_cps(void *data, object cont, object v, object k, object obj) object Cyc_vector_set_cps(void *data, object cont, object v, object k, object obj)
{ {
int idx; int idx;
@ -2268,11 +2250,6 @@ object Cyc_vector_set_cps(void *data, object cont, object v, object k, object ob
} }
} }
object Cyc_vector_set_unsafe2(void *data, object cont, object v, object k, object obj)
{
return Cyc_vector_set_unsafe_cps(data, cont, v, k, obj);
}
object Cyc_vector_set_unsafe_cps(void *data, object cont, object v, object k, object obj) object Cyc_vector_set_unsafe_cps(void *data, object cont, object v, object k, object obj)
{ {
int idx = unbox_number(k); int idx = unbox_number(k);
@ -4988,7 +4965,7 @@ void _set_91car_67(void *data, object cont, object args)
//return_closcall1(data, cont, Cyc_set_car(data, car(args), cadr(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);
//Cyc_set_car2(data, cont, car(args), cadr(args)); //Cyc_set_car2(data, cont, car(args), cadr(args));
return_closcall1(data, cont, Cyc_set_car2(data, cont, car(args), cadr(args))); return_closcall1(data, cont, Cyc_set_car_cps(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)
@ -4997,7 +4974,7 @@ void _set_91cdr_67(void *data, object cont, object args)
//return_closcall1(data, cont, Cyc_set_cdr(data, car(args), cadr(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);
//Cyc_set_cdr2(data, cont, car(args), cadr(args)); //Cyc_set_cdr2(data, cont, car(args), cadr(args));
return_closcall1(data, cont, Cyc_set_cdr2(data, cont, car(args), cadr(args))); return_closcall1(data, cont, Cyc_set_cdr_cps(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)
@ -5417,7 +5394,7 @@ 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_set2(data, cont, car(args), cadr(args), caddr(args)); object ref = Cyc_vector_set_cps(data, cont, car(args), cadr(args), caddr(args));
return_closcall1(data, cont, ref); return_closcall1(data, cont, ref);
}} }}