--- stack/stack.c	2002/02/02 15:12:56	1.20
+++ stack/stack.c	2002/02/02 20:06:11	1.25
@@ -64,7 +64,7 @@
   out_hash= out_hash%HASHTBLSIZE;
   position= &(in_hashtbl[out_hash]);
 
-  while(position != NULL){
+  while(1){
     if(*position==NULL)		/* If empty */
       return position;
     
@@ -73,8 +73,6 @@
 
     position= &((*position)->next); /* Try next */
   }
-  return NULL;			/* end of list reached without finding
-                                   an empty position */
 }
 
 /* Generic push function. */
@@ -160,7 +158,9 @@
     else
       def_sym(in_hash, in_string); /* Make symbol */
       
-    new_item->content.ptr= *hash(in_hash, in_string); /* XXX */
+    new_item->content.ptr= *hash(in_hash, in_string); /* The new reference 
+							 shouldn't point at 
+							 NULL */
     new_item->type= ref;
   }
 
@@ -196,26 +196,31 @@
 }
 
 /* Prints the top element of the stack. */
-void print_(stackitem** stack_head)
+extern void print_(stackitem** stack_head)
 {
-  if((*stack_head)==NULL) {
+  stackitem* temp= *stack_head;
+
+  if(temp==NULL) {
     printerr("Stack empty");
     return;
   }
 
-  switch((*stack_head)->type) {
+  while(temp->type==ref)
+    temp= temp->content.ptr;
+
+  switch(temp->type) {
   case value:
-    printf("%d", (*stack_head)->content.val);
+    printf("%d", temp->content.val);
     break;
   case string:
-    printf("%s", (char*)(*stack_head)->content.ptr);
-    break;
-  case ref:
-    printf("%s", ((stackitem*)(*stack_head)->content.ptr)->id);
+    printf("\"%s\"", (char*)temp->content.ptr);
     break;
   case symbol:
+  case func:
+    printf("%s", temp->id);
+    break;
   default:
-    printf("%p", (*stack_head)->content.ptr);
+    printf("%p", temp->content.ptr);
     break;
   }
 }
@@ -243,7 +248,7 @@
 {
   if(*stack_head != NULL) {
     print_st(*stack_head, 1);
-    printf("\n");
+    nl();
   } else {
     printerr("Stack empty");
   }
@@ -254,19 +259,24 @@
 extern void eval(stackitem** stack_head)
 {
   funcp in_func;
+  stackitem* temp= *stack_head;
 
-  if((*stack_head)==NULL || (*stack_head)->type!=ref) {
-    printerr("Stack empty or not a reference");
+  if(temp==NULL) {
+    printerr("Stack empty");
     return;
   }
 
-  if(((stackitem*)(*stack_head)->content.ptr)->type==func) {
-    in_func= (funcp)((stackitem*)(*stack_head)->content.ptr)->content.ptr;
+  while(temp->type==ref)
+    temp= temp->content.ptr;
+
+  if(temp->type==func) {
+    in_func= (funcp)(temp->content.ptr);
     toss(stack_head); 
     (*in_func)(stack_head);
     return;
-  } else
-    printerr("Not a function");
+  } 
+    
+  printerr("Couldn't evaluate");
 }
 
 /* Make a list. */
@@ -275,27 +285,27 @@
   void* delimiter;
   stackitem *iterator, *temp, *pack;
 
-  if((*stack_head)==NULL) {
-    printerr("Stack empty");
-    return;
-  }
-
   delimiter= (*stack_head)->content.ptr; /* Get delimiter */
   toss(stack_head);
 
   iterator= *stack_head;
 
-  /* Search for first delimiter */
-  while(iterator->next!=NULL && iterator->next->content.ptr!=delimiter)
-    iterator= iterator->next;
-
-  /* Extract list */
-  temp= *stack_head;
-  *stack_head= iterator->next;
-  iterator->next= NULL;
-  
-  if(*stack_head!=NULL && (*stack_head)->content.ptr==delimiter)
+  if(iterator==NULL || iterator->content.ptr==delimiter) {
+    temp= NULL;
     toss(stack_head);
+  } else {
+    /* Search for first delimiter */
+    while(iterator->next!=NULL && iterator->next->content.ptr!=delimiter)
+      iterator= iterator->next;
+    
+    /* Extract list */
+    temp= *stack_head;
+    *stack_head= iterator->next;
+    iterator->next= NULL;
+    
+    if(*stack_head!=NULL && (*stack_head)->content.ptr==delimiter)
+      toss(stack_head);
+  }
 
   /* Push list */
   pack= malloc(sizeof(stackitem));
@@ -335,14 +345,14 @@
       break;
     } 
     /* If symbol */
-    if((convert= sscanf(in_line, "%[^] ;\n\r]%[^\n\r]", temp, rest))) {
+    if((convert= sscanf(in_line, "%[^][ ;\n\r]%[^\n\r]", temp, rest))) {
 	push_ref(stack_head, in_hash, temp);
 	break;
     }
     /* If single char */
     if((convert= sscanf(in_line, "%c%[^\n\r]", temp, rest))) {
       if(*temp==';') {
-	if(non_eval_flag) {
+	if(!non_eval_flag) {
 	  eval(stack_head);		/* Evaluate top element */
 	  break;
 	}
@@ -354,7 +364,8 @@
       if(*temp==']') {
 	push_ref(stack_head, in_hash, "[");
 	pack(stack_head);
-	non_eval_flag--;
+	if(non_eval_flag!=0)
+	  non_eval_flag--;
 	break;
       }
 
@@ -395,6 +406,9 @@
   new_head= temp= (*stack_head)->content.ptr;
   toss(stack_head);
 
+  if(temp==NULL)
+    return;
+
   /* Search the end of the list */
   while(temp->next!=NULL)
     temp= temp->next;
@@ -491,6 +505,13 @@
   exit(EXIT_SUCCESS);
 }
 
+/* Clear stack */
+extern void clear(stackitem** stack_head)
+{
+  while(*stack_head!=NULL)
+    toss(stack_head);
+}
+
 int main()
 {
   stackitem* s= NULL;