--- stack/stack.c	2002/03/16 09:12:39	1.110
+++ stack/stack.c	2002/03/16 19:09:54	1.111
@@ -60,7 +60,8 @@
   env->gc_count= 0;
   env->gc_ref= NULL;
 
-  env->head= NULL;
+  env->head= new_val(env);
+  env->head->type= empty;
   for(i= 0; i<HASHTBLSIZE; i++)
     env->symbols[i]= NULL;
   env->err= 0;
@@ -78,7 +79,7 @@
 /* Discard the top element of the stack. */
 extern void toss(environment *env)
 {
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -352,7 +353,7 @@
 {
   char *new_string;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -451,7 +452,7 @@
 {
   int typenum;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -507,19 +508,22 @@
     /* A list is just a stack, so make stack_head point to it */
     stack_head= CAR(stack_head);
     printf("[ ");
-    while(stack_head != NULL) {
+    while(CAR(stack_head)->type != empty) {
       print_h(stack_head, noquote);
-      printf(" ");
+      if(CDR(stack_head)->type==tcons)
+	printf(" ");
+      else
+	printf(" . ");		/* Improper list */
       stack_head= CDR(stack_head);
     }
-    printf("]");
+    printf(" ]");
     break;
   }
 }
 
 extern void print_(environment *env)
 {
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -538,7 +542,7 @@
 
 extern void princ_(environment *env)
 {
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -557,7 +561,7 @@
 /* Only to be called by function printstack. */
 void print_st(value *stack_head, long counter)
 { 
-  if(CDR(stack_head) != NULL)
+  if(CDR(stack_head)->type != empty)
     print_st(CDR(stack_head), counter+1);
   printf("%ld: ", counter);
   print_h(stack_head, 0);
@@ -567,7 +571,7 @@
 /* Prints the stack. */
 extern void printstack(environment *env)
 {
-  if(env->head == NULL) {
+  if(env->head->type == empty) {
     printf("Stack Empty\n");
     return;
   }
@@ -580,7 +584,7 @@
 {
   value *temp= env->head;
   
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type == empty || CDR(env->head)->type == empty) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
@@ -596,8 +600,8 @@
 {
   value *temp= env->head;
   
-  if(env->head==NULL || CDR(env->head)==NULL
-     || CDR(CDR(env->head))==NULL) {
+  if(env->head->type == empty || CDR(env->head)->type == empty
+     || CDR(CDR(env->head))->type == empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -613,7 +617,7 @@
 {
   value *val;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -651,7 +655,7 @@
 
   gc_maybe(env);
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -682,7 +686,7 @@
     toss(env); if(env->err) return;
     iterator= temp_val;
     
-    while(iterator!=NULL) {
+    while(iterator->type != empty) {
       push_val(env, CAR(iterator));
       
       if(CAR(env->head)->type==symb
@@ -690,13 +694,13 @@
 	toss(env);
 	if(env->err) return;
 	
-	if(CDR(iterator)==NULL){
+	if(CDR(iterator)->type == empty){
 	  goto eval_start;
 	}
 	eval(env);
 	if(env->err) return;
       }
-      if (CDR(iterator)==NULL || CDR(iterator)->type == tcons) 
+      if (CDR(iterator)->type == empty || CDR(iterator)->type == tcons) 
 	iterator= CDR(iterator);
       else {
 	printerr("Bad Argument Type"); /* Improper list */
@@ -717,12 +721,15 @@
 {
   value *old_head, *new_head, *item;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
+  if(CAR(env->head)->type==empty)
+    return;			/* Don't reverse an empty list */
+
   if(CAR(env->head)->type!=tcons) {
     printerr("Bad Argument Type");
     env->err= 2;
@@ -730,8 +737,9 @@
   }
 
   old_head= CAR(env->head);
-  new_head= NULL;
-  while(old_head!=NULL) {
+  new_head= new_val(env);
+  new_head->type= empty;
+  while(old_head->type != empty) {
     item= old_head;
     old_head= CDR(old_head);
     CDR(item)= new_head;
@@ -743,17 +751,20 @@
 /* Make a list. */
 extern void pack(environment *env)
 {
-  value *iterator, *temp;
+  value *iterator, *temp, *ending;
+
+  ending=new_val(env);
+  ending->type=empty;
 
   iterator= env->head;
-  if(iterator==NULL
+  if(iterator->type == empty
      || (CAR(iterator)->type==symb
      && CAR(iterator)->content.sym->id[0]=='[')) {
-    temp= NULL;
+    temp= ending;
     toss(env);
   } else {
     /* Search for first delimiter */
-    while(CDR(iterator)!=NULL
+    while(CDR(iterator)->type != empty
 	  && (CAR(CDR(iterator))->type!=symb
 	   || CAR(CDR(iterator))->content.sym->id[0]!='['))
       iterator= CDR(iterator);
@@ -761,9 +772,9 @@
     /* Extract list */
     temp= env->head;
     env->head= CDR(iterator);
-    CDR(iterator)= NULL;
+    CDR(iterator)= ending;
 
-    if(env->head!=NULL)
+    if(env->head->type != empty)
       toss(env);
   }
 
@@ -779,7 +790,7 @@
   value *temp, *new_head;
 
   /* Is top element a list? */
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -802,7 +813,7 @@
   toss(env);
 
   /* Find the end of the list */
-  while(CDR(temp)->content.ptr != NULL) {
+  while(CDR(temp)->type != empty) {
     if (CDR(temp)->type == tcons)
       temp= CDR(temp);
     else {
@@ -823,7 +834,7 @@
 {
   void *left, *right;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -841,7 +852,7 @@
 {
   int val;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -872,7 +883,7 @@
   symbol *sym;
 
   /* Needs two values on the stack, the top one must be a symbol */
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -926,7 +937,7 @@
 /* Clear stack */
 extern void clear(environment *env)
 {
-  while(env->head!=NULL)
+  while(env->head->type != empty)
     toss(env);
 }
 
@@ -965,21 +976,20 @@
 extern void forget(environment *env)
 {
   char* sym_id;
-  value *stack_head= env->head;
 
-  if(stack_head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
   
-  if(CAR(stack_head)->type!=symb) {
+  if(CAR(env->head)->type!=symb) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  sym_id= CAR(stack_head)->content.sym->id;
+  sym_id= CAR(env->head)->content.sym->id;
   toss(env);
 
   return forget_sym(hash(env->symbols, sym_id));
@@ -1030,7 +1040,7 @@
   }
 
   if(myenv.interactive) {
-    printf("Stack version $Revision: 1.110 $\n\
+    printf("Stack version $Revision: 1.111 $\n\
 Copyright (C) 2002  Mats Alritzson and Teddy Hogeborn\n\
 Stack comes with ABSOLUTELY NO WARRANTY; for details type 'warranty;'.\n\
 This is free software, and you are welcome to redistribute it\n\
@@ -1053,7 +1063,7 @@
     if (myenv.err==4) {		/* EOF */
       myenv.err=0;
       quit(&myenv);
-    } else if(myenv.head!=NULL
+    } else if(myenv.head->type!=empty
 	      && CAR(myenv.head)->type==symb
 	      && CAR(myenv.head)->content.sym->id[0]
 	      ==';') {
@@ -1075,7 +1085,7 @@
   char* new_string;
   value *a_val, *b_val;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1153,7 +1163,7 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
@@ -1213,7 +1223,7 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1329,7 +1339,7 @@
 /* "dup"; duplicates an item on the stack */
 extern void sx_647570(environment *env)
 {
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1342,7 +1352,7 @@
 {
   int truth;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1373,8 +1383,8 @@
 {
   int truth;
 
-  if(env->head==NULL || CDR(env->head)==NULL 
-     || CDR(CDR(env->head))==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty
+     || CDR(CDR(env->head))->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1406,9 +1416,9 @@
 
 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) {
+  if(env->head->type==empty || CDR(env->head)->type==empty 
+     || CDR(CDR(env->head))->type==empty || CDR(CDR(CDR(env->head)))->type==empty
+     || CDR(CDR(CDR(CDR(env->head))))->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1429,8 +1439,8 @@
 
 extern void then(environment *env)
 {
-  if(env->head==NULL || CDR(env->head)==NULL
-     || CDR(CDR(env->head))==NULL) { 
+  if(env->head->type==empty || CDR(env->head)->type==empty
+     || CDR(CDR(env->head))->type==empty) { 
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1453,7 +1463,7 @@
   int truth;
   value *loop, *test;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1499,8 +1509,8 @@
   value *loop;
   int foo1, foo2;
 
-  if(env->head==NULL || CDR(env->head)==NULL 
-     || CDR(CDR(env->head))==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty 
+     || CDR(CDR(env->head))->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1547,7 +1557,7 @@
   value *loop, *foo;
   value *iterator;
   
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1590,7 +1600,7 @@
   int ending, start, i;
   value *iterator, *temp;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1620,7 +1630,7 @@
 
   iterator= env->head;
 
-  if(iterator==NULL
+  if(iterator->type==empty
      || (CAR(iterator)->type==symb
 	 && CAR(iterator)->content.sym->id[0]=='[')) {
     temp= NULL;
@@ -1742,7 +1752,7 @@
 {
   int freq, dur, period, ticks;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1787,7 +1797,7 @@
 {
   int dur;
 
-  if(env->head==NULL) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -1807,7 +1817,7 @@
 
 extern void copying(environment *env)
 {
-  printf("GNU GENERAL PUBLIC LICENSE\n\
+  printf("		    GNU GENERAL PUBLIC LICENSE\n\
 		       Version 2, June 1991\n\
 \n\
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n\
@@ -2096,7 +2106,7 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -2156,7 +2166,7 @@
   int a, b;
   float fa, fb;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -2215,7 +2225,7 @@
 {
   int a, b;
 
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
@@ -2241,7 +2251,7 @@
 {
   int a, b;
   
-  if(env->head==NULL || CDR(env->head)==NULL) {
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;