From 6a5713da369d2a80226c5ab4e12bd7140c14ad9b Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Wed, 20 Apr 2016 23:21:15 -0400 Subject: [PATCH] Refactoring --- include/cyclone/types.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/include/cyclone/types.h b/include/cyclone/types.h index 1eee9822..5f03200d 100644 --- a/include/cyclone/types.h +++ b/include/cyclone/types.h @@ -91,10 +91,6 @@ enum object_tag { // Define the size of object tags typedef unsigned char tag_type; -// Temporary defines! -#define cons_tag 0 -// END - /* Threading */ typedef enum { CYC_THREAD_STATE_NEW, CYC_THREAD_STATE_RUNNABLE, CYC_THREAD_STATE_BLOCKED, CYC_THREAD_STATE_BLOCKED_COOPERATING, @@ -425,7 +421,6 @@ typedef struct { object cons_cdr; } pair_type; typedef pair_type *list; -typedef pair_type cons_type; typedef pair_type *pair; #define make_pair(n,a,d) \ @@ -435,13 +430,6 @@ typedef pair_type *pair; n.tag = pair_tag; \ n.cons_car = a; \ n.cons_cdr = d; -#define make_cons(n,a,d) \ - pair_type n; \ - n.hdr.mark = gc_color_red; \ - n.hdr.grayed = 0; \ - n.tag = pair_tag; \ - n.cons_car = a; \ - n.cons_cdr = d; #define make_cell(n,a) make_pair(n,a,NULL); @@ -536,7 +524,7 @@ static const object primitive_##name = &name##_primitive /* All constant-size objects */ typedef union { boolean_type boolean_t; - pair_type cons_t; + pair_type pair_t; symbol_type symbol_t; primitive_type primitive_t; integer_type integer_t;