From 0e224e551bdd624946a0a49a9ec96a3fe69f3d03 Mon Sep 17 00:00:00 2001
From: simon <simon@journeyman.cc>
Date: Fri, 6 Oct 2017 18:27:01 +0100
Subject: [PATCH] EVAL on arithmetic operations still not working

---
 src/conspage.c        |  1 +
 src/consspaceobject.c | 28 ++++++++++++++++------------
 src/consspaceobject.h |  5 ++---
 src/lispops.c         |  6 +++---
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/conspage.c b/src/conspage.c
index 0b03d53..2e4d90a 100644
--- a/src/conspage.c
+++ b/src/conspage.c
@@ -149,6 +149,7 @@ void free_cell( struct cons_pointer pointer ) {
 struct cons_pointer allocate_cell( char *tag ) {
     struct cons_pointer result = freelist;
 
+
     if ( result.page == NIL.page && result.offset == NIL.offset ) {
         make_cons_page(  );
         result = allocate_cell( tag );
diff --git a/src/consspaceobject.c b/src/consspaceobject.c
index da0be0b..8a5371d 100644
--- a/src/consspaceobject.c
+++ b/src/consspaceobject.c
@@ -77,40 +77,44 @@ void dump_object( FILE * output, struct cons_pointer pointer ) {
     switch ( cell.tag.value ) {
     case CONSTV:
         fwprintf( output,
-                  L"\t\tCons cell: car at page %d offset %d, cdr at page %d offset %d\n",
+                  L"\t\tCons cell: car at page %d offset %d, cdr at page %d offset %d, count %u\n",
                   cell.payload.cons.car.page,
                   cell.payload.cons.car.offset,
-                  cell.payload.cons.cdr.page, cell.payload.cons.cdr.offset );
+                  cell.payload.cons.cdr.page, 
+                 cell.payload.cons.cdr.offset,
+                 cell.count);
         break;
     case INTEGERTV:
         fwprintf( output,
-                  L"\t\tInteger cell: value %ld\n",
-                  cell.payload.integer.value );
+                  L"\t\tInteger cell: value %ld, count %u\n",
+                  cell.payload.integer.value, cell.count );
         break;
     case FREETV:
         fwprintf( output, L"\t\tFree cell: next at page %d offset %d\n",
                   cell.payload.cons.cdr.page, cell.payload.cons.cdr.offset );
         break;
     case REALTV:
-        fwprintf( output, L"\t\tReal cell: value %Lf\n",
-                  cell.payload.real.value );
+        fwprintf( output, L"\t\tReal cell: value %Lf, count %u\n",
+                  cell.payload.real.value, cell.count );
         break;
     case STRINGTV:
         fwprintf( output,
-                  L"\t\tString cell: character '%1c' (%1d) next at page %2d offset %3d\n",
+                  L"\t\tString cell: character '%1c' (%1d) next at page %2d offset %3d, count %u\n",
                   cell.payload.string.character,
                   cell.payload.string.cdr.page,
-                  cell.payload.string.cdr.offset );
-        fwprintf( output, L"\t\t value:" );
+                  cell.payload.string.cdr.offset,
+                  cell.count );
+        fwprintf( output, L"\t\t value: " );
         print( output, pointer );
         fwprintf( output, L"\n" );
         break;
     case SYMBOLTV:
         fwprintf( output,
-                  L"\t\tSymbol cell: character '%1c' (%1d) next at page %2d offset %3d\n",
+                  L"\t\tSymbol cell: character '%1c' (%1d) next at page %2d offset %3d, count %u\n",
                   cell.payload.string.character,
                   cell.payload.string.cdr.page,
-                  cell.payload.string.cdr.offset );
+                  cell.payload.string.cdr.offset,
+                  cell.count );
         fwprintf( output, L"\t\t value:" );
         print( output, pointer );
         fwprintf( output, L"\n" );
@@ -204,7 +208,7 @@ struct cons_pointer make_symbol( wint_t c, struct cons_pointer tail ) {
  */
 struct cons_pointer
 make_special( struct cons_pointer src, struct cons_pointer ( *executable )
-               ( struct struct stack_frame * frame,
+               ( struct stack_frame * frame,
                  struct cons_pointer env  ) ) {
     struct cons_pointer pointer = allocate_cell( SPECIALTAG );
     struct cons_space_object *cell = &pointer2cell( pointer );
diff --git a/src/consspaceobject.h b/src/consspaceobject.h
index e87255a..649ec4b 100644
--- a/src/consspaceobject.h
+++ b/src/consspaceobject.h
@@ -425,9 +425,8 @@ struct cons_pointer make_function( struct cons_pointer src,
  */
 struct cons_pointer make_special( struct cons_pointer src,
                                   struct cons_pointer ( *executable )
-                                   ( struct cons_pointer s_expr,
-                                     struct cons_pointer env,
-                                     struct stack_frame * frame ) );
+                                   ( struct stack_frame *,
+                                     struct cons_pointer ) );
 
 /**
  * Construct a string from this character and this tail. A string is
diff --git a/src/lispops.c b/src/lispops.c
index 725fd31..dc33db3 100644
--- a/src/lispops.c
+++ b/src/lispops.c
@@ -257,7 +257,7 @@ lisp_car( struct stack_frame *frame, struct cons_pointer env ) {
     } else {
         struct cons_pointer message =
             c_string_to_lisp_string
-            ( "Attempt to take CAR/CDR of non sequence" );
+            ( "Attempt to take CAR of non sequence" );
         result = lisp_throw( message, frame );
     }
 
@@ -275,14 +275,14 @@ lisp_cdr( struct stack_frame *frame, struct cons_pointer env ) {
 
     if ( consp( frame->arg[0] ) ) {
         struct cons_space_object cell = pointer2cell( frame->arg[0] );
-        result = cell.payload.cons.car;
+        result = cell.payload.cons.cdr;
     } else if ( stringp( frame->arg[0] ) ) {
         struct cons_space_object cell = pointer2cell( frame->arg[0] );
         result = cell.payload.string.cdr;
     } else {
         struct cons_pointer message =
             c_string_to_lisp_string
-            ( "Attempt to take CAR/CDR of non sequence" );
+            ( "Attempt to take CDR of non sequence" );
         result = lisp_throw( message, frame );
     }