--- stack/stack.c	2002/01/07 23:35:37	1.4
+++ stack/stack.c	2002/01/08 14:17:33	1.8
@@ -11,7 +11,7 @@
 
 typedef struct stack_item
 {
-  enum {value, string, ref, func, symbol} type;
+  enum {value, string, ref, func, symbol, list} type;
   union {
     void* ptr;
     int val;
@@ -121,15 +121,17 @@
 
 int push_ref(stackitem** stack_head, hashtbl in_hash, const char* in_string)
 {
-  void* handle;
+  static void* handle= NULL;
   void* symbol;
-  
+
   stackitem* new_item= malloc(sizeof(stackitem));
   new_item->content.ptr= *hash(in_hash, in_string);
   new_item->type= ref;
 
-  if(new_item->content.ptr==NULL) {
+  if(handle==NULL)
     handle= dlopen(NULL, RTLD_LAZY);
+
+  if(new_item->content.ptr==NULL) {
     symbol= dlsym(handle, in_string);
     if(dlerror()==NULL) 
       def_func(in_hash, symbol, in_string);
@@ -148,32 +150,60 @@
 {
   stackitem* temp= *stack_head;
 
+  if((*stack_head)==NULL)
+    return;
+  
+  if((*stack_head)->type==string)
+    free((*stack_head)->content.ptr);
+
   *stack_head= (*stack_head)->next;
   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:
-  case func:
+    printf("%s", ((stackitem*)(*stack_head)->content.ptr)->id);
+    break;
   case symbol:
-    printf("%ld: %p\n", counter, stack_head->content.ptr);
+  default:
+    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) {
@@ -231,24 +261,56 @@
   return 1;
 }
 
-extern void print(stackitem** stack_head)
+extern void pack(stackitem** stack_head)
 {
+  void* delimiter;
+  stackitem *iterator, *temp, *pack;
+
   if((*stack_head)==NULL)
     return;
 
-  if((*stack_head)->type==value)
-    printf("%d", (*stack_head)->content.val);
-  else if((*stack_head)->type==string)
-    printf("%s", (char*)(*stack_head)->content.ptr);
-  else
-    printf("%p", (*stack_head)->content.ptr);
+  delimiter= (*stack_head)->content.ptr;
+  toss(stack_head);
+
+  iterator= *stack_head;
 
+  while(iterator->next!=NULL && iterator->next->content.ptr!=delimiter)
+    iterator= iterator->next;
+
+  temp= *stack_head;
+  *stack_head= iterator->next;
+  iterator->next= NULL;
+  
+  if(*stack_head!=NULL && (*stack_head)->content.ptr==delimiter)
+    toss(stack_head);
+
+  pack= malloc(sizeof(stackitem));
+  pack->type= list;
+  pack->content.ptr= temp;
+
+  push(stack_head, pack);
+}
+
+extern void expand(stackitem** stack_head)
+{
+  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 nl()
+extern void quit()
 {
-  printf("\n");
+  exit(EXIT_SUCCESS);
 }
 
 int main()