From dc33c2fd7ee11ccc24b4723ecdca9564488ad2bf Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Wed, 20 Apr 2016 03:22:12 -0400 Subject: [PATCH] Refactoring --- include/cyclone/runtime.h | 1 - include/cyclone/types.h | 8 ++++---- runtime.c | 12 ------------ 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h index bf5ec239..1c32f0b5 100644 --- a/include/cyclone/runtime.h +++ b/include/cyclone/runtime.h @@ -237,7 +237,6 @@ object Cyc_num_op_va_list(void *data, int argc, object (fn_op(void *, common_typ int equal(object,object); list assq(void *,object,list); list assoc(void *,object x, list l); -//object get(object,object); object equalp(object,object); object memberp(void *,object,list); object memqp(void *,object,list); diff --git a/include/cyclone/types.h b/include/cyclone/types.h index 71ffe4bd..76ecf388 100644 --- a/include/cyclone/types.h +++ b/include/cyclone/types.h @@ -9,13 +9,13 @@ #ifndef CYCLONE_TYPES_H #define CYCLONE_TYPES_H -#include -#include -#include +#include #include #include +#include +#include #include -#include +#include #include // Maximum number of args that GC will accept diff --git a/runtime.c b/runtime.c index 1a5bd6d0..840ce455 100644 --- a/runtime.c +++ b/runtime.c @@ -745,18 +745,6 @@ object memqp(void *data, object x, list l) for (; l != NULL; l = cdr(l)) if (eq(x,car(l))) return boolean_t; return boolean_f;} -//object get(object x, object i) -//{ -// object plist, plistd; -// if (x == NULL) return x; -// if (type_of(x)!=symbol_tag) {printf("get: bad x=%ld\n",((closure)x)->tag); exit(0);} -// plist = symbol_plist(x); -// for (; (plist != NULL); plist = cdr(plistd)) -// {plistd = cdr(plist); -// if (eq(car(plist),i)) return car(plistd);} -// return NULL; -//} - object equalp(object x, object y) { for (; ; x = cdr(x), y = cdr(y)) {