--- stack/stack.c	2002/03/11 08:52:59	1.103
+++ stack/stack.c	2002/03/16 09:12:39	1.110
@@ -20,6 +20,9 @@
 	     Teddy Hogeborn <teddy@fukt.bth.se>
 */
 
+#define CAR(X) X->content.c->car
+#define CDR(X) X->content.c->cdr
+
 /* printf, sscanf, fgets, fprintf, fopen, perror */
 #include <stdio.h>
 /* exit, EXIT_SUCCESS, malloc, free */
@@ -34,12 +37,17 @@
 #include <unistd.h>
 /* EX_NOINPUT, EX_USAGE */
 #include <sysexits.h>
+/* assert */
+#include <assert.h>
+
+#ifdef __linux__
 /* mtrace, muntrace */
 #include <mcheck.h>
 /* ioctl */
 #include <sys/ioctl.h>
 /* KDMKTONE */
 #include <linux/kd.h>
+#endif /* __linux__ */
 
 #include "stack.h"
 
@@ -70,16 +78,13 @@
 /* Discard the top element of the stack. */
 extern void toss(environment *env)
 {
-  cons *temp= env->head;
-
   if(env->head==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  env->head= env->head->cdr->content.c; /* Remove the top stack item */
-  free(temp);			/* Free the old top stack item */
+  env->head= CDR(env->head); /* Remove the top stack item */
 }
 
 /* Returns a pointer to a pointer to an element in the hash table. */
@@ -118,6 +123,7 @@
   stackitem *nitem= malloc(sizeof(stackitem));
 
   nval->content.ptr= NULL;
+  nval->type= integer;
 
   nitem->item= nval;
   nitem->next= env->gc_ref;
@@ -140,9 +146,9 @@
 
   val->gc.flag.mark= 1;
 
-  if(val->type==tcons && val->content.c!=NULL) {
-    gc_mark(val->content.c->car);
-    gc_mark(val->content.c->cdr);
+  if(val->type==tcons) {
+    gc_mark(CAR(val));
+    gc_mark(CDR(val));
   }
 }
 
@@ -166,10 +172,7 @@
     printf("Garbage collecting.");
 
   /* Mark values on stack */
-  if(env->head!=NULL) {
-    gc_mark(env->head->car);
-    gc_mark(env->head->cdr);
-  }
+  gc_mark(env->head);
 
   if(env->interactive)
     printf(".");
@@ -185,7 +188,6 @@
   if(env->interactive)
     printf(".");
 
-
   env->gc_count= 0;
 
   while(env->gc_ref!=NULL) {	/* Sweep unused values */
@@ -200,7 +202,32 @@
       free(env->gc_ref);	/* Remove value */
       env->gc_ref= titem;
       continue;
-    } 
+    }
+#ifdef DEBUG
+    printf("Kept value (%p)", env->gc_ref->item);
+    if(env->gc_ref->item->gc.flag.mark)
+      printf(" (marked)");
+    if(env->gc_ref->item->gc.flag.protect)
+      printf(" (protected)");
+    switch(env->gc_ref->item->type){
+    case integer:
+      printf(" integer: %d", env->gc_ref->item->content.i);
+      break;
+    case func:
+      printf(" func: %p", env->gc_ref->item->content.ptr);
+      break;
+    case symb:
+      printf(" symb: %s", env->gc_ref->item->content.sym->id);
+      break;
+    case tcons:
+      printf(" tcons: %p\t%p", env->gc_ref->item->content.c->car,
+	     env->gc_ref->item->content.c->cdr);
+      break;
+    default:
+      printf(" <unknown %d>", (env->gc_ref->item->type));
+    }
+    printf("\n");
+#endif /* DEBUG */
 
     /* Keep values */     
     env->gc_count += sizeof(value);
@@ -220,7 +247,7 @@
   env->gc_ref= new_head;
 
   if(env->interactive)
-    printf("done\n");
+    printf("done (%d bytes still allocated)\n", env->gc_count);
 
 }
 
@@ -232,9 +259,9 @@
 
   val->gc.flag.protect= 1;
 
-  if(val->type==tcons && val->content.c!=NULL) {
-    protect(val->content.c->car);
-    protect(val->content.c->cdr);
+  if(val->type==tcons) {
+    protect(CAR(val));
+    protect(CDR(val));
   }
 }
 
@@ -246,22 +273,23 @@
 
   val->gc.flag.protect= 0;
 
-  if(val->type==tcons && val->content.c!=NULL) {
-    unprotect(val->content.c->car);
-    unprotect(val->content.c->cdr);
+  if(val->type==tcons) {
+    unprotect(CAR(val));
+    unprotect(CDR(val));
   }
 }
 
 /* Push a value onto the stack */
 void push_val(environment *env, value *val)
 {
-  cons *new_item= malloc(sizeof(cons));
-  new_item->car= val;
+  value *new_value= new_val(env);
 
-  new_item->cdr= new_val(env);
-  new_item->cdr->type= tcons;
-  new_item->cdr->content.c= env->head;
-  env->head= new_item;
+  new_value->content.c= malloc(sizeof(cons));
+  assert(new_value->content.c!=NULL);
+  new_value->type= tcons;
+  CAR(new_value)= val;
+  CDR(new_value)= env->head;
+  env->head= new_value;
 }
 
 /* Push an integer onto the stack */
@@ -324,19 +352,20 @@
 {
   char *new_string;
 
-  if((env->head)==NULL) {
+  if(env->head==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type!=string) {
+  if(CAR(env->head)->type!=string) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  new_string= mangle_str((const char *)(env->head->car->content.ptr));
+  new_string= 
+    mangle_str((const char *)(CAR(env->head)->content.ptr));
 
   toss(env);
   if(env->err) return;
@@ -422,12 +451,13 @@
 {
   int typenum;
 
-  if((env->head)==NULL) {
+  if(env->head==NULL) {
     printerr("Too Few Arguments");
-    env->err=1;
+    env->err= 1;
     return;
   }
-  typenum=env->head->car->type;
+
+  typenum= CAR(env->head)->type;
   toss(env);
   switch(typenum){
   case integer:
@@ -452,35 +482,35 @@
 }    
 
 /* Prints the top element of the stack. */
-void print_h(cons *stack_head, int noquote)
+void print_h(value *stack_head, int noquote)
 {
-  switch(stack_head->car->type) {
+  switch(CAR(stack_head)->type) {
   case integer:
-    printf("%d", stack_head->car->content.i);
+    printf("%d", CAR(stack_head)->content.i);
     break;
   case tfloat:
-    printf("%f", stack_head->car->content.f);
+    printf("%f", CAR(stack_head)->content.f);
     break;
   case string:
     if(noquote)
-      printf("%s", (char*)stack_head->car->content.ptr);
+      printf("%s", (char*)CAR(stack_head)->content.ptr);
     else
-      printf("\"%s\"", (char*)stack_head->car->content.ptr);
+      printf("\"%s\"", (char*)CAR(stack_head)->content.ptr);
     break;
   case symb:
-    printf("%s", ((symbol *)(stack_head->car->content.ptr))->id);
+    printf("%s", CAR(stack_head)->content.sym->id);
     break;
   case func:
-    printf("#<function %p>", (funcp)(stack_head->car->content.ptr));
+    printf("#<function %p>", (funcp)(CAR(stack_head)->content.ptr));
     break;
   case tcons:
     /* A list is just a stack, so make stack_head point to it */
-    stack_head=stack_head->car->content.c;
+    stack_head= CAR(stack_head);
     printf("[ ");
     while(stack_head != NULL) {
       print_h(stack_head, noquote);
       printf(" ");
-      stack_head= stack_head->cdr->content.c;
+      stack_head= CDR(stack_head);
     }
     printf("]");
     break;
@@ -491,7 +521,7 @@
 {
   if(env->head==NULL) {
     printerr("Too Few Arguments");
-    env->err=1;
+    env->err= 1;
     return;
   }
   print_h(env->head, 0);
@@ -510,7 +540,7 @@
 {
   if(env->head==NULL) {
     printerr("Too Few Arguments");
-    env->err=1;
+    env->err= 1;
     return;
   }
   print_h(env->head, 1);
@@ -525,10 +555,10 @@
 }
 
 /* Only to be called by function printstack. */
-void print_st(cons *stack_head, long counter)
+void print_st(value *stack_head, long counter)
 { 
-  if(stack_head->cdr->content.c != NULL)
-    print_st(stack_head->cdr->content.c, counter+1);
+  if(CDR(stack_head) != NULL)
+    print_st(CDR(stack_head), counter+1);
   printf("%ld: ", counter);
   print_h(stack_head, 0);
   nl();
@@ -548,34 +578,34 @@
 /* Swap the two top elements on the stack. */
 extern void swap(environment *env)
 {
-  cons *temp= env->head;
+  value *temp= env->head;
   
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
-  env->head= env->head->cdr->content.c;
-  temp->cdr->content.c= env->head->cdr->content.c;
-  env->head->cdr->content.c= temp;
+  env->head= CDR(env->head);
+  CDR(temp)= CDR(env->head);
+  CDR(env->head)= temp;
 } 
 
 /* Rotate the first three elements on the stack. */
 extern void rot(environment *env)
 {
-  cons *temp= env->head;
+  value *temp= env->head;
   
-  if(env->head==NULL || env->head->cdr->content.c==NULL
-     || env->head->cdr->content.c->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL
+     || CDR(CDR(env->head))==NULL) {
     printerr("Too Few Arguments");
-    env->err=1;
+    env->err= 1;
     return;
   }
-
-  env->head= env->head->cdr->content.c->cdr->content.c;
-  temp->cdr->content.c->cdr->content.c= env->head->cdr->content.c;
-  env->head->cdr->content.c= temp;
+  
+  env->head= CDR(CDR(env->head));
+  CDR(CDR(temp))= CDR(env->head);
+  CDR(env->head)= temp;
 }
 
 /* Recall a value from a symbol, if bound */
@@ -589,23 +619,23 @@
     return;
   }
 
-  if(env->head->car->type!=symb) {
+  if(CAR(env->head)->type!=symb) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  val= ((symbol *)(env->head->car->content.ptr))->val;
+  val= CAR(env->head)->content.sym->val;
   if(val == NULL){
     printerr("Unbound Variable");
     env->err= 3;
     return;
   }
-  protect(val);
-  toss(env);		/* toss the symbol */
+  push_val(env, val);		/* Return the symbol's bound value */
+  swap(env);
+  if(env->err) return;
+  toss(env);			/* toss the symbol */
   if(env->err) return;
-  push_val(env, val); /* Return its bound value */
-  unprotect(val);
 }
 
 /* If the top element is a symbol, determine if it's bound to a
@@ -615,7 +645,7 @@
 {
   funcp in_func;
   value* temp_val;
-  cons* iterator;
+  value* iterator;
 
  eval_start:
 
@@ -627,47 +657,47 @@
     return;
   }
 
-  switch(env->head->car->type) {
+  switch(CAR(env->head)->type) {
     /* if it's a symbol */
   case symb:
     rcl(env);			/* get its contents */
     if(env->err) return;
-    if(env->head->car->type!=symb){ /* don't recurse symbols */
+    if(CAR(env->head)->type!=symb){ /* don't recurse symbols */
       goto eval_start;
     }
     return;
 
     /* If it's a lone function value, run it */
   case func:
-    in_func= (funcp)(env->head->car->content.ptr);
+    in_func= (funcp)(CAR(env->head)->content.ptr);
     toss(env); 
     if(env->err) return;
     return in_func(env);
 
     /* If it's a list */
   case tcons:
-    temp_val= env->head->car;
+    temp_val= CAR(env->head);
     protect(temp_val);
 
     toss(env); if(env->err) return;
-    iterator= (cons*)temp_val->content.ptr;
+    iterator= temp_val;
     
     while(iterator!=NULL) {
-      push_val(env, iterator->car);
+      push_val(env, CAR(iterator));
       
-      if(env->head->car->type==symb
-	 && (((symbol*)(env->head->car->content.ptr))->id[0] == ';')) {
+      if(CAR(env->head)->type==symb
+	 && CAR(env->head)->content.sym->id[0]==';') {
 	toss(env);
 	if(env->err) return;
 	
-	if(iterator->cdr->content.ptr==NULL){
+	if(CDR(iterator)==NULL){
 	  goto eval_start;
 	}
 	eval(env);
 	if(env->err) return;
       }
-      if (iterator->cdr->type == tcons) 
-	iterator= iterator->cdr->content.c;
+      if (CDR(iterator)==NULL || CDR(iterator)->type == tcons) 
+	iterator= CDR(iterator);
       else {
 	printerr("Bad Argument Type"); /* Improper list */
 	env->err= 2;
@@ -685,78 +715,68 @@
 /* Reverse (flip) a list */
 extern void rev(environment *env)
 {
-  cons *old_head, *new_head, *item;
+  value *old_head, *new_head, *item;
 
-  if((env->head)==NULL) {
+  if(env->head==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type!=tcons) {
+  if(CAR(env->head)->type!=tcons) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  old_head= env->head->car->content.c;
+  old_head= CAR(env->head);
   new_head= NULL;
   while(old_head!=NULL) {
     item= old_head;
-    old_head= old_head->cdr->content.c;
-    item->cdr->content.c= new_head;
+    old_head= CDR(old_head);
+    CDR(item)= new_head;
     new_head= item;
   }
-  env->head->car->content.ptr= new_head;
+  CAR(env->head)= new_head;
 }
 
 /* Make a list. */
 extern void pack(environment *env)
 {
-  cons *iterator, *temp;
-  value *pack;
+  value *iterator, *temp;
 
   iterator= env->head;
-  pack= new_val(env);
-  protect(pack);
-
   if(iterator==NULL
-     || (iterator->car->type==symb
-     && ((symbol*)(iterator->car->content.ptr))->id[0]=='[')) {
+     || (CAR(iterator)->type==symb
+     && CAR(iterator)->content.sym->id[0]=='[')) {
     temp= NULL;
     toss(env);
   } else {
     /* Search for first delimiter */
-    while(iterator->cdr->content.c!=NULL
-	  && (iterator->cdr->content.c->car->type!=symb
-	      || ((symbol*)(iterator->cdr->content.c->car->content.ptr))->id[0]
-	      !='['))
-      iterator= iterator->cdr->content.c;
+    while(CDR(iterator)!=NULL
+	  && (CAR(CDR(iterator))->type!=symb
+	   || CAR(CDR(iterator))->content.sym->id[0]!='['))
+      iterator= CDR(iterator);
     
     /* Extract list */
     temp= env->head;
-    env->head= iterator->cdr->content.c;
-    iterator->cdr->content.c= NULL;
+    env->head= CDR(iterator);
+    CDR(iterator)= NULL;
 
-    pack->type= tcons;
-    pack->content.ptr= temp;
-    
     if(env->head!=NULL)
       toss(env);
   }
 
   /* Push list */
 
-  push_val(env, pack);
+  push_val(env, temp);
   rev(env);
-
-  unprotect(pack);
 }
 
 /* Relocate elements of the list on the stack. */
 extern void expand(environment *env)
 {
-  cons *temp, *new_head;
+  value *temp, *new_head;
 
   /* Is top element a list? */
   if(env->head==NULL) {
@@ -764,7 +784,8 @@
     env->err= 1;
     return;
   }
-  if(env->head->car->type!=tcons) {
+
+  if(CAR(env->head)->type!=tcons) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
@@ -776,14 +797,14 @@
     return;
 
   /* The first list element is the new stack head */
-  new_head= temp= env->head->car->content.c;
+  new_head= temp= CAR(env->head);
 
   toss(env);
 
   /* Find the end of the list */
-  while(temp->cdr->content.ptr != NULL) {
-    if (temp->cdr->type == tcons)
-      temp= temp->cdr->content.c;
+  while(CDR(temp)->content.ptr != NULL) {
+    if (CDR(temp)->type == tcons)
+      temp= CDR(temp);
     else {
       printerr("Bad Argument Type"); /* Improper list */
       env->err= 2;
@@ -792,7 +813,7 @@
   }
 
   /* Connect the tail of the list with the old stack head */
-  temp->cdr->content.c= env->head;
+  CDR(temp)= env->head;
   env->head= new_head;		/* ...and voila! */
 
 }
@@ -802,15 +823,14 @@
 {
   void *left, *right;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  left= env->head->car->content.ptr;
-  swap(env);
-  right= env->head->car->content.ptr;
+  left= CAR(env->head)->content.ptr;
+  right= CAR(CDR(env->head))->content.ptr;
   toss(env); toss(env);
 
   push_int(env, left==right);
@@ -827,13 +847,13 @@
     return;
   }
 
-  if(env->head->car->type!=integer) {
+  if(CAR(env->head)->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  val= env->head->car->content.i;
+  val= CAR(env->head)->content.i;
   toss(env);
   push_int(env, !val);
 }
@@ -852,23 +872,23 @@
   symbol *sym;
 
   /* Needs two values on the stack, the top one must be a symbol */
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type!=symb) {
+  if(CAR(env->head)->type!=symb) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
   /* long names are a pain */
-  sym= env->head->car->content.ptr;
+  sym= CAR(env->head)->content.ptr;
 
   /* Bind the symbol to the value */
-  sym->val= env->head->cdr->content.c->car;
+  sym->val= CAR(CDR(env->head));
 
   toss(env); toss(env);
 } 
@@ -891,10 +911,14 @@
   env->gc_limit= 0;
   gc_maybe(env);
 
+  words(env);
+
   if(env->free_string!=NULL)
     free(env->free_string);
   
+#ifdef __linux__
   muntrace();
+#endif
 
   exit(EXIT_SUCCESS);
 }
@@ -915,6 +939,10 @@
   for(i= 0; i<HASHTBLSIZE; i++) {
     temp= env->symbols[i];
     while(temp!=NULL) {
+#ifdef DEBUG
+      if (temp->val != NULL && temp->val->gc.flag.protect)
+	printf("(protected) ");
+#endif /* DEBUG */
       printf("%s\n", temp->id);
       temp= temp->next;
     }
@@ -937,7 +965,7 @@
 extern void forget(environment *env)
 {
   char* sym_id;
-  cons *stack_head= env->head;
+  value *stack_head= env->head;
 
   if(stack_head==NULL) {
     printerr("Too Few Arguments");
@@ -945,13 +973,13 @@
     return;
   }
   
-  if(stack_head->car->type!=symb) {
+  if(CAR(stack_head)->type!=symb) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  sym_id= ((symbol*)(stack_head->car->content.ptr))->id;
+  sym_id= CAR(stack_head)->content.sym->id;
   toss(env);
 
   return forget_sym(hash(env->symbols, sym_id));
@@ -969,7 +997,9 @@
 
   int c;			/* getopt option character */
 
+#ifdef __linux__
   mtrace();
+#endif
 
   init_env(&myenv);
 
@@ -983,7 +1013,7 @@
 	break;
       case '?':
 	fprintf (stderr,
-		 "Unknown option character `\\x%x'.\n",
+		 "Unknown option character '\\x%x'.\n",
 		 optopt);
 	return EX_USAGE;
       default:
@@ -1000,11 +1030,11 @@
   }
 
   if(myenv.interactive) {
-    printf("Stack version $Revision: 1.103 $\n\
+    printf("Stack version $Revision: 1.110 $\n\
 Copyright (C) 2002  Mats Alritzson and Teddy Hogeborn\n\
-Stack comes with ABSOLUTELY NO WARRANTY; for details type `warranty;'.\n\
+Stack comes with ABSOLUTELY NO WARRANTY; for details type 'warranty;'.\n\
 This is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `copying;' for details.\n");
+under certain conditions; type 'copying;' for details.\n");
   }
 
   while(1) {
@@ -1019,12 +1049,14 @@
       }
       myenv.err=0;
     }
-    sx_72656164(&myenv);
-    if (myenv.err==4) {
-      return EXIT_SUCCESS;	/* EOF */
+    sx_72656164(&myenv);	/* "read" */
+    if (myenv.err==4) {		/* EOF */
+      myenv.err=0;
+      quit(&myenv);
     } else if(myenv.head!=NULL
-	      && myenv.head->car->type==symb
-	      && ((symbol*)(myenv.head->car->content.ptr))->id[0]==';') {
+	      && CAR(myenv.head)->type==symb
+	      && CAR(myenv.head)->content.sym->id[0]
+	      ==';') {
       toss(&myenv); 		/* No error check in main */
       eval(&myenv);
     }
@@ -1043,16 +1075,16 @@
   char* new_string;
   value *a_val, *b_val;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type==string
-     && env->head->cdr->content.c->car->type==string) {
-    a_val= env->head->car;
-    b_val= env->head->cdr->content.c->car;
+  if(CAR(env->head)->type==string
+     && CAR(CDR(env->head))->type==string) {
+    a_val= CAR(env->head);
+    b_val= CAR(CDR(env->head));
     protect(a_val); protect(b_val);
     toss(env); if(env->err) return;
     toss(env); if(env->err) return;
@@ -1067,44 +1099,44 @@
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b+a);
 
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==tfloat) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==tfloat) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb+fa);
     
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==integer) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==integer) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_float(env, b+fa);
     
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==tfloat) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==tfloat) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb+a);
 
@@ -1121,50 +1153,50 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b-a);
 
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==tfloat) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==tfloat) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb-fa);
     
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==integer) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==integer) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_float(env, b-fa);
     
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==tfloat) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==tfloat) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb-a);
 
@@ -1181,50 +1213,50 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a=env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b=env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b>a);
 
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==tfloat) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==tfloat) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_int(env, fb>fa);
     
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==integer) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==integer) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b>fa);
     
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==tfloat) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==tfloat) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_int(env, fb>a);
 
@@ -1232,7 +1264,7 @@
   }
 
   printerr("Bad Argument Type");
-  env->err=2;
+  env->err= 2;
 }
 
 /* "<" */
@@ -1259,12 +1291,13 @@
 /* Return copy of a value */
 value *copy_val(environment *env, value *old_value)
 {
-  cons *old_item, *new_item, *prev_item;
   value *new_value;
 
+  if(old_value==NULL)
+    return NULL;
+
   protect(old_value);
   new_value= new_val(env);
-  protect(new_value);
   new_value->type= old_value->type;
 
   switch(old_value->type){
@@ -1279,20 +1312,16 @@
       strdup((char *)(old_value->content.ptr));
     break;
   case tcons:
-    new_value->content.ptr= NULL;
 
-    prev_item= NULL;
-    old_item= old_value->content.c;
+    new_value->content.c= malloc(sizeof(cons));
+    assert(new_value->content.c!=NULL);
 
-    if(old_value->content.ptr != NULL) { /* if list is not empty */
-      new_item= malloc(sizeof(cons));
-      new_item->car= copy_val(env, old_item->car); /* recurse */
-      new_item->cdr= copy_val(env, old_item->cdr); /* recurse */
-    }
+    CAR(new_value)= copy_val(env, CAR(old_value)); /* recurse */
+    CDR(new_value)= copy_val(env, CDR(old_value)); /* recurse */
     break;
   }
 
-  unprotect(old_value); unprotect(new_value);
+  unprotect(old_value);
 
   return new_value;
 }
@@ -1305,7 +1334,7 @@
     env->err= 1;
     return;
   }
-  push_val(env, copy_val(env, env->head->car));
+  push_val(env, copy_val(env, CAR(env->head)));
 }
 
 /* "if", If-Then */
@@ -1313,13 +1342,13 @@
 {
   int truth;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->cdr->content.c->car->type != integer) {
+  if(CAR(CDR(env->head))->type != integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
@@ -1328,7 +1357,7 @@
   swap(env);
   if(env->err) return;
   
-  truth=env->head->car->content.i;
+  truth= CAR(env->head)->content.i;
 
   toss(env);
   if(env->err) return;
@@ -1344,14 +1373,14 @@
 {
   int truth;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL
-     || env->head->cdr->content.c->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL 
+     || CDR(CDR(env->head))==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->cdr->content.c->cdr->content.c->car->type!=integer) {
+  if(CAR(CDR(CDR(env->head)))->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
@@ -1360,7 +1389,7 @@
   rot(env);
   if(env->err) return;
   
-  truth= env->head->car->content.i;
+  truth= CAR(env->head)->content.i;
 
   toss(env);
   if(env->err) return;
@@ -1375,23 +1404,66 @@
   eval(env);
 }
 
+extern void sx_656c7365(environment *env)
+{
+  if(env->head==NULL || CDR(env->head)==NULL 
+     || CDR(CDR(env->head))==NULL || CDR(CDR(CDR(env->head)))==NULL
+     || CDR(CDR(CDR(CDR(env->head))))==NULL) {
+    printerr("Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+
+  if(CAR(CDR(env->head))->type!=symb
+     || strcmp(CAR(CDR(env->head))->content.sym->id, "then")!=0
+     || CAR(CDR(CDR(CDR(env->head))))->type!=symb
+     || strcmp(CAR(CDR(CDR(CDR(env->head))))->content.sym->id, "if")!=0) {
+    printerr("Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  swap(env); toss(env); rot(env); toss(env);
+  ifelse(env);
+}
+
+extern void then(environment *env)
+{
+  if(env->head==NULL || CDR(env->head)==NULL
+     || CDR(CDR(env->head))==NULL) { 
+    printerr("Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+
+  if(CAR(CDR(env->head))->type!=symb
+     || strcmp(CAR(CDR(env->head))->content.sym->id, "if")!=0) {
+    printerr("Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  swap(env); toss(env);
+  sx_6966(env);
+}
+
 /* "while" */
 extern void sx_7768696c65(environment *env)
 {
   int truth;
   value *loop, *test;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  loop= env->head->car;
+  loop= CAR(env->head);
   protect(loop);
   toss(env); if(env->err) return;
 
-  test= env->head->car;
+  test= CAR(env->head);
   protect(test);
   toss(env); if(env->err) return;
 
@@ -1399,13 +1471,13 @@
     push_val(env, test);
     eval(env);
     
-    if(env->head->car->type != integer) {
+    if(CAR(env->head)->type != integer) {
       printerr("Bad Argument Type");
       env->err= 2;
       return;
     }
     
-    truth= env->head->car->content.i;
+    truth= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     
     if(truth) {
@@ -1427,28 +1499,28 @@
   value *loop;
   int foo1, foo2;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL 
-     || env->head->cdr->content.c->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL 
+     || CDR(CDR(env->head))==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->cdr->content.c->car->type!=integer
-     || env->head->cdr->content.c->cdr->content.c->car->type!=integer) {
+  if(CAR(CDR(env->head))->type!=integer
+     || CAR(CDR(CDR(env->head)))->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  loop= env->head->car;
+  loop= CAR(env->head);
   protect(loop);
   toss(env); if(env->err) return;
 
-  foo2= env->head->car->content.i;
+  foo2= CAR(env->head)->content.i;
   toss(env); if(env->err) return;
 
-  foo1= env->head->car->content.i;
+  foo1= CAR(env->head)->content.i;
   toss(env); if(env->err) return;
 
   if(foo1<=foo2) {
@@ -1473,36 +1545,36 @@
 extern void foreach(environment *env)
 {  
   value *loop, *foo;
-  cons *iterator;
+  value *iterator;
   
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->cdr->content.c->car->type!=tcons) {
+  if(CAR(CDR(env->head))->type!=tcons) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  loop= env->head->car;
+  loop= CAR(env->head);
   protect(loop);
   toss(env); if(env->err) return;
 
-  foo= env->head->car;
+  foo= CAR(env->head);
   protect(foo);
   toss(env); if(env->err) return;
 
-  iterator= foo->content.c;
+  iterator= foo;
 
   while(iterator!=NULL) {
-    push_val(env, iterator->car);
+    push_val(env, CAR(iterator));
     push_val(env, loop);
     eval(env); if(env->err) return;
-    if (iterator->cdr->type == tcons){
-      iterator= iterator->cdr->content.c;
+    if (iterator->type == tcons){
+      iterator= CDR(iterator);
     } else {
       printerr("Bad Argument Type"); /* Improper list */
       env->err= 2;
@@ -1516,25 +1588,24 @@
 extern void to(environment *env)
 {
   int ending, start, i;
-  cons *iterator, *temp;
-  value *pack;
+  value *iterator, *temp;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type!=integer 
-     || env->head->cdr->content.c->car->type!=integer) {
+  if(CAR(env->head)->type!=integer 
+     || CAR(CDR(env->head))->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  ending= env->head->car->content.i;
+  ending= CAR(env->head)->content.i;
   toss(env); if(env->err) return;
-  start= env->head->car->content.i;
+  start= CAR(env->head)->content.i;
   toss(env); if(env->err) return;
 
   push_sym(env, "[");
@@ -1548,39 +1619,30 @@
   }
 
   iterator= env->head;
-  pack= new_val(env);
-  protect(pack);
 
   if(iterator==NULL
-     || (iterator->car->type==symb
-	 && ((symbol*)(iterator->car->content.ptr))->id[0]=='[')) {
+     || (CAR(iterator)->type==symb
+	 && CAR(iterator)->content.sym->id[0]=='[')) {
     temp= NULL;
     toss(env);
   } else {
     /* Search for first delimiter */
-    while(iterator->cdr->content.c!=NULL
-	  && (iterator->cdr->content.c->car->type!=symb
-	      || ((symbol*)(iterator->cdr->content.c->car->content.ptr))->id[0]
-	      !='['))
-      iterator= iterator->cdr->content.ptr;
+    while(CDR(iterator)!=NULL 
+	  && (CAR(CDR(iterator))->type!=symb
+	      || CAR(CDR(iterator))->content.sym->id[0]!='['))
+      iterator= CDR(iterator);
     
     /* Extract list */
     temp= env->head;
-    env->head= iterator->cdr->content.c;
-    iterator->cdr->content.c= NULL;
+    env->head= CDR(iterator);
+    CDR(iterator)= NULL;
 
-    pack->type= tcons;
-    pack->content.ptr= temp;
-    
     if(env->head!=NULL)
       toss(env);
   }
 
   /* Push list */
-
-  push_val(env, pack);
-
-  unprotect(pack);
+  push_val(env, temp);
 }
 
 /* Read a string */
@@ -1619,14 +1681,14 @@
     }
     readline(env); if(env->err) return;
 
-    if(((char *)(env->head->car->content.ptr))[0]=='\0'){
+    if(((char *)(CAR(env->head)->content.ptr))[0]=='\0'){
       env->err= 4;		/* "" means EOF */
       return;
     }
     
-    env->in_string= malloc(strlen(env->head->car->content.ptr)+1);
+    env->in_string= malloc(strlen(CAR(env->head)->content.ptr)+1);
     env->free_string= env->in_string; /* Save the original pointer */
-    strcpy(env->in_string, env->head->car->content.ptr);
+    strcpy(env->in_string, CAR(env->head)->content.ptr);
     toss(env); if(env->err) return;
   }
   
@@ -1675,26 +1737,27 @@
     return sx_72656164(env);
 }
 
+#ifdef __linux__
 extern void beep(environment *env)
 {
   int freq, dur, period, ticks;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type!=integer
-     || env->head->cdr->content.c->car->type!=integer) {
+  if(CAR(env->head)->type!=integer
+     || CAR(CDR(env->head))->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  dur= env->head->car->content.i;
+  dur= CAR(env->head)->content.i;
   toss(env);
-  freq= env->head->car->content.i;
+  freq= CAR(env->head)->content.i;
   toss(env);
 
   period= 1193180/freq;		/* convert freq from Hz to period
@@ -1717,6 +1780,7 @@
     abort();
   }
 }
+#endif /* __linux__ */
 
 /* "wait" */
 extern void sx_77616974(environment *env)
@@ -1729,13 +1793,13 @@
     return;
   }
 
-  if(env->head->car->type!=integer) {
+  if(CAR(env->head)->type!=integer) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  dur=env->head->car->content.i;
+  dur= CAR(env->head)->content.i;
   toss(env);
 
   usleep(dur);
@@ -2032,50 +2096,50 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b*a);
 
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==tfloat) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==tfloat) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb*fa);
     
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==integer) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==integer) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_float(env, b*fa);
     
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==tfloat) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==tfloat) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb*a);
 
@@ -2092,50 +2156,50 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_float(env, b/a);
 
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==tfloat) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==tfloat) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb/fa);
     
     return;
   }
 
-  if(env->head->car->type==tfloat
-     && env->head->cdr->content.c->car->type==integer) {
-    fa= env->head->car->content.f;
+  if(CAR(env->head)->type==tfloat
+     && CAR(CDR(env->head))->type==integer) {
+    fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_float(env, b/fa);
     
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==tfloat) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==tfloat) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    fb= env->head->car->content.f;
+    fb= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     push_float(env, fb/a);
 
@@ -2151,17 +2215,17 @@
 {
   int a, b;
 
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, b%a);
 
@@ -2177,17 +2241,17 @@
 {
   int a, b;
   
-  if(env->head==NULL || env->head->cdr->content.c==NULL) {
+  if(env->head==NULL || CDR(env->head)==NULL) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(env->head->car->type==integer
-     && env->head->cdr->content.c->car->type==integer) {
-    a= env->head->car->content.i;
+  if(CAR(env->head)->type==integer
+     && CAR(CDR(env->head))->type==integer) {
+    a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
-    b= env->head->car->content.i;
+    b= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     push_int(env, (int)b/a);