--- stack/stack.c	2002/01/08 13:46:05	1.7
+++ stack/stack.c	2002/01/08 14:17:33	1.8
@@ -160,31 +160,50 @@
   free(temp);
 }
 
+extern void nl()
+{
+  printf("\n");
+}
 
-/* print_stack(stack); */
-void print_st(stackitem* stack_head, long counter)
-{ 
-  if(stack_head->next != NULL)
-    print_st(stack_head->next, counter+1);
+void prin(stackitem** stack_head)
+{
+  if((*stack_head)==NULL)
+    return;
 
-  switch(stack_head->type){
+  switch((*stack_head)->type) {
   case value:
-    printf("%ld: %d\n", counter, (int)stack_head->content.val);
+    printf("%d", (*stack_head)->content.val);
     break;
   case string:
-    printf("%ld: \"%s\"\n", counter, (char*)stack_head->content.ptr);
+    printf("%s", (char*)(*stack_head)->content.ptr);
     break;
   case ref:
-    printf("%ld: %s\n", counter, ((stackitem*)stack_head->content.ptr)->id);
+    printf("%s", ((stackitem*)(*stack_head)->content.ptr)->id);
     break;
-  case func:
   case symbol:
   default:
-    printf("%ld: %p\n", counter, stack_head->content.ptr);
+    printf("%p", (*stack_head)->content.ptr);
     break;
   }
 }
 
+extern void print(stackitem** stack_head)
+{
+  prin(stack_head);
+  toss(stack_head);
+}
+
+/* print_stack(stack); */
+void print_st(stackitem* stack_head, long counter)
+{ 
+  if(stack_head->next != NULL)
+    print_st(stack_head->next, counter+1);
+
+  printf("%ld: ", counter);
+  prin(&stack_head);
+  nl();
+}
+
 extern void printstack(stackitem** stack_head)
 {
   if(*stack_head != NULL) {
@@ -242,30 +261,6 @@
   return 1;
 }
 
-extern void print(stackitem** stack_head)
-{
-  if((*stack_head)==NULL)
-    return;
-
-  switch((*stack_head)->type){
-  case value:
-    printf("%d", (*stack_head)->content.val);
-    break;
-  case string:
-    printf("%s", (char*)(*stack_head)->content.ptr);
-    break;
-  case ref:
-    printf("%s", ((stackitem*)(*stack_head)->content.ptr)->id);
-    break;
-  case symbol:
-  default:
-    printf("%p", (*stack_head)->content.ptr);
-    break;
-  }
-
-  toss(stack_head);
-}
-
 extern void pack(stackitem** stack_head)
 {
   void* delimiter;
@@ -295,11 +290,22 @@
 
   push(stack_head, pack);
 }
-  
 
-extern void nl()
+extern void expand(stackitem** stack_head)
 {
-  printf("\n");
+  stackitem *temp, *new_head;
+
+  if((*stack_head)==NULL || (*stack_head)->type!=list)
+    return;
+
+  new_head= temp= (*stack_head)->content.ptr;
+  toss(stack_head);
+
+  while(temp->next!=NULL)
+    temp= temp->next;
+
+  temp->next= *stack_head;
+  *stack_head= new_head;
 }
 
 extern void quit()