From aa85e34002f3d0c2f6dd80079c51361c6e787e8d Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Wed, 20 Apr 2016 23:45:35 -0400
Subject: [PATCH] Refactoring

---
 include/cyclone/runtime.h  |  4 ++--
 include/cyclone/types.h    | 14 +++++++-------
 runtime.c                  | 16 ++++++++--------
 scheme/process-context.sld |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h
index e0d6919e..b70be9c2 100644
--- a/include/cyclone/runtime.h
+++ b/include/cyclone/runtime.h
@@ -78,8 +78,8 @@ object Cyc_global_set(void *thd, object *glo, object value);
         var[i].hdr.mark = gc_color_red; \
         var[i].hdr.grayed = 0; \
         var[i].tag = pair_tag; \
-        var[i].cons_car = tmp; \
-        var[i].cons_cdr = (i == (count-1)) ? NULL : &var[i + 1]; \
+        var[i].pair_car = tmp; \
+        var[i].pair_cdr = (i == (count-1)) ? NULL : &var[i + 1]; \
       } \
       va_end(va); \
     } \
diff --git a/include/cyclone/types.h b/include/cyclone/types.h
index 5f03200d..6cf46c5e 100644
--- a/include/cyclone/types.h
+++ b/include/cyclone/types.h
@@ -195,7 +195,7 @@ typedef enum { STAGE_CLEAR_OR_MARKING, STAGE_TRACING
 #endif
 
 #define type_of(obj) (((pair_type *) obj)->tag)
-#define forward(obj) (((pair_type *) obj)->cons_car)
+#define forward(obj) (((pair_type *) obj)->pair_car)
 
 /** Define value types. 
  *  Depending on the underlying architecture, compiler, etc these types
@@ -417,8 +417,8 @@ typedef bytevector_type *bytevector;
 typedef struct {
   gc_header_type hdr;
   tag_type tag;
-  object cons_car;
-  object cons_cdr;
+  object pair_car;
+  object pair_cdr;
 } pair_type;
 typedef pair_type *list;
 typedef pair_type *pair;
@@ -428,13 +428,13 @@ typedef pair_type *pair;
   n.hdr.mark = gc_color_red; \
   n.hdr.grayed = 0; \
   n.tag = pair_tag; \
-  n.cons_car = a; \
-  n.cons_cdr = d;
+  n.pair_car = a; \
+  n.pair_cdr = d;
 
 #define make_cell(n,a) make_pair(n,a,NULL);
 
-#define car(x)    (((pair_type *) x)->cons_car)
-#define cdr(x)    (((pair_type *) x)->cons_cdr)
+#define car(x)    (((pair_type *) x)->pair_car)
+#define cdr(x)    (((pair_type *) x)->pair_cdr)
 #define caar(x)   (car(car(x)))
 #define cadr(x)   (car(cdr(x)))
 #define cdar(x)   (cdr(car(x)))
diff --git a/runtime.c b/runtime.c
index e85b39e3..b4ecfcf4 100644
--- a/runtime.c
+++ b/runtime.c
@@ -1422,8 +1422,8 @@ object Cyc_command_line_arguments(void *data, object cont) {
     ((list)pl)->hdr.mark = gc_color_red;
     ((list)pl)->hdr.grayed = 0;
     ((list)pl)->tag = pair_tag;
-    ((list)pl)->cons_car = ps;
-    ((list)pl)->cons_cdr = lis;
+    ((list)pl)->pair_car = ps;
+    ((list)pl)->pair_cdr = lis;
     lis = pl;
   }
   return_closcall1(data, cont, lis);
@@ -2081,8 +2081,8 @@ list mcons(object a, object d)
   c->hdr.mark = gc_color_red;
   c->hdr.grayed = 0;
   c->tag = pair_tag; 
-  c->cons_car = a; 
-  c->cons_cdr = d;
+  c->pair_car = a; 
+  c->pair_cdr = d;
   return c;
 }
 
@@ -2652,8 +2652,8 @@ void Cyc_apply(void *data, int argc, closure cont, object prim, ...){
         args[i].hdr.mark = gc_color_red;
         args[i].hdr.grayed = 0;
         args[i].tag = pair_tag;
-        args[i].cons_car = tmp;
-        args[i].cons_cdr = (i == (argc-1)) ? NULL : &args[i + 1];
+        args[i].pair_car = tmp;
+        args[i].pair_cdr = (i == (argc-1)) ? NULL : &args[i + 1];
     }
     //printf("DEBUG applying primitive to ");
     //Cyc_display((object)&args[0]);
@@ -2685,8 +2685,8 @@ void Cyc_apply_from_buf(void *data, int argc, object prim, object *buf) {
         args[i - 1].hdr.mark = gc_color_red;
         args[i - 1].hdr.grayed = 0;
         args[i - 1].tag = pair_tag;
-        args[i - 1].cons_car = buf[i];
-        args[i - 1].cons_cdr = (i == (argc-1)) ? NULL : &args[i];
+        args[i - 1].pair_car = buf[i];
+        args[i - 1].pair_cdr = (i == (argc-1)) ? NULL : &args[i];
     }
 
     apply(data, cont, prim, (object)&args[0]);
diff --git a/scheme/process-context.sld b/scheme/process-context.sld
index 5b0fe115..ec579955 100644
--- a/scheme/process-context.sld
+++ b/scheme/process-context.sld
@@ -29,8 +29,8 @@
           ((list)pl)->hdr.mark = gc_color_red;
           ((list)pl)->hdr.grayed = 0;
           ((list)pl)->tag = pair_tag;
-          ((list)pl)->cons_car = ps;
-          ((list)pl)->cons_cdr = lis;
+          ((list)pl)->pair_car = ps;
+          ((list)pl)->pair_cdr = lis;
           lis = pl;
         }
         return_closcall1(data, k, lis); ")