--- stack/stack.c	2002/02/11 00:54:04	1.69
+++ stack/stack.c	2002/02/13 19:53:55	1.77
@@ -9,7 +9,7 @@
 /* strcmp, strcpy, strlen, strcat, strdup */
 #include <string.h>
 
-#define HASHTBLSIZE 65536
+#define HASHTBLSIZE 2048
 
 /* First, define some types. */
 
@@ -59,6 +59,7 @@
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
   int non_eval_flag;
+  char *in_string;		/* Input pending to be read */
 } environment;
 
 /* A type for pointers to external functions */
@@ -70,6 +71,7 @@
 {
   int i;
 
+  env->in_string= NULL;
   env->err= 0;
   env->non_eval_flag= 0;
   for(i= 0; i<HASHTBLSIZE; i++)
@@ -153,49 +155,39 @@
   }
 }
 
-/* Generic push function. */
-void push(stackitem** stack_head, stackitem* in_item)
-{
-  in_item->next= *stack_head;
-  *stack_head= in_item;
-}
-
 /* Push a value onto the stack */
-void push_val(stackitem **stack_head, value *val)
+void push_val(environment *env, value *val)
 {
   stackitem *new_item= malloc(sizeof(stackitem));
   new_item->item= val;
   val->refcount++;
-  push(stack_head, new_item);
+  new_item->next= env->head;
+  env->head= new_item;
 }
 
 /* Push an integer onto the stack. */
-void push_int(stackitem **stack_head, int in_val) 
+void push_int(environment *env, int in_val) 
 {
   value *new_value= malloc(sizeof(value));
-  stackitem *new_item= malloc(sizeof(stackitem));
-  new_item->item= new_value;
   
   new_value->content.val= in_val;
   new_value->type= integer;
   new_value->refcount=1;
 
-  push(stack_head, new_item);
+  push_val(env, new_value);
 }
 
 /* Copy a string onto the stack. */
-void push_cstring(stackitem **stack_head, const char *in_string)
+void push_cstring(environment *env, const char *in_string)
 {
   value *new_value= malloc(sizeof(value));
-  stackitem *new_item= malloc(sizeof(stackitem));
-  new_item->item=new_value;
 
   new_value->content.ptr= malloc(strlen(in_string)+1);
   strcpy(new_value->content.ptr, in_string);
   new_value->type= string;
   new_value->refcount=1;
 
-  push(stack_head, new_item);
+  push_val(env, new_value);
 }
 
 /* Mangle a symbol name to a valid C identifier name */
@@ -244,14 +236,12 @@
   new_value->type= string;
   new_value->refcount=1;
 
-  push_val(&(env->head), new_value);
+  push_val(env, new_value);
 }
 
 /* Push a symbol onto the stack. */
 void push_sym(environment *env, const char *in_string)
 {
-  stackitem *new_item;		/* The new stack item */
-  /* ...which will contain... */
   value *new_value;		/* A new symbol value */
   /* ...which might point to... */
   symbol **new_symbol;		/* (if needed) A new actual symbol */
@@ -264,10 +254,7 @@
   const char *dlerr;		/* Dynamic linker error */
   char *mangled;		/* Mangled function name */
 
-  /* Create a new stack item containing a new value */
-  new_item= malloc(sizeof(stackitem));
   new_value= malloc(sizeof(value));
-  new_item->item=new_value;
 
   /* The new value is a symbol */
   new_value->type= symb;
@@ -311,7 +298,7 @@
       new_fvalue->refcount= 1;
     }
   }
-  push(&(env->head), new_item);
+  push_val(env, new_value);
 }
 
 /* Print newline. */
@@ -475,11 +462,9 @@
   }
   toss(env);		/* toss the symbol */
   if(env->err) return;
-  push_val(&(env->head), val); /* Return its bound value */
+  push_val(env, val); /* Return its bound value */
 }
 
-void stack_read(environment*, char*);
-
 /* If the top element is a symbol, determine if it's bound to a
    function value, and if it is, toss the symbol and execute the
    function. */
@@ -488,7 +473,6 @@
   funcp in_func;
   value* temp_val;
   stackitem* iterator;
-  char* temp_string;
 
   if(env->head==NULL) {
     printerr("Too Few Arguments");
@@ -523,7 +507,7 @@
     if(env->err) return;
     iterator= (stackitem*)temp_val->content.ptr;
     while(iterator!=NULL) {
-      push_val(&(env->head), iterator->item);
+      push_val(env, iterator->item);
       if(env->head->item->type==symb
 	&& strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {
 	toss(env);
@@ -540,29 +524,14 @@
     free_val(temp_val);
     return;
 
-    /* If it's a string */
-  case string:
-    temp_val= env->head->item;
-    env->head->item->refcount++;
-    toss(env);
-    if(env->err) return;
-    temp_string= malloc(strlen((char*)temp_val->content.ptr)+5);
-    strcpy(temp_string, "[ ");
-    strcpy(temp_string+2, (char*)temp_val->content.ptr);
-    free_val(temp_val);
-    strcat(temp_string, " ]");
-    stack_read(env, temp_string);
-    free(temp_string);
-    goto eval_start;
-
-  case integer:
+  default:
     return;
   }
 }
 
 /* Reverse (flip) a list */
 extern void rev(environment *env){
-  stackitem *old_head, *new_head, *item;
+  stackitem *item, *temp, *prev= NULL;
 
   if((env->head)==NULL) {
     printerr("Too Few Arguments");
@@ -576,36 +545,36 @@
     return;
   }
 
-  old_head=(stackitem *)(env->head->item->content.ptr);
-  new_head=NULL;
-  while(old_head != NULL){
-    item=old_head;
-    old_head=old_head->next;
-    item->next=new_head;
-    new_head=item;
+  item= (stackitem *)(env->head->item->content.ptr);
+  while(item->next!=NULL){
+    temp= item->next;
+    item->next= prev;
+    prev= item;
+    item= temp;
   }
-  env->head->item->content.ptr=new_head;
+  item->next= prev;
+
+  env->head->item->content.ptr=item;
 }
 
 /* Make a list. */
 extern void pack(environment *env)
 {
-  void* delimiter;
   stackitem *iterator, *temp;
   value *pack;
 
-  delimiter= env->head->item->content.ptr; /* Get delimiter */
-  toss(env);
-
   iterator= env->head;
 
-  if(iterator==NULL || iterator->item->content.ptr==delimiter) {
+  if(iterator==NULL
+     || (iterator->item->type==symb
+     && ((symbol*)(iterator->item->content.ptr))->id[0]=='[')) {
     temp= NULL;
     toss(env);
   } else {
     /* Search for first delimiter */
     while(iterator->next!=NULL
-	  && iterator->next->item->content.ptr!=delimiter)
+	  && (iterator->next->item->type!=symb
+	  || ((symbol*)(iterator->next->item->content.ptr))->id[0]!='['))
       iterator= iterator->next;
     
     /* Extract list */
@@ -623,92 +592,10 @@
   pack->content.ptr= temp;
   pack->refcount= 1;
 
-  temp= malloc(sizeof(stackitem));
-  temp->item= pack;
-
-  push(&(env->head), temp);
+  push_val(env, pack);
   rev(env);
 }
 
-/* Parse input. */
-void stack_read(environment *env, char *in_line) 
-{
-  char *temp, *rest;
-  int itemp;
-  size_t inlength= strlen(in_line)+1;
-  int convert= 0;
-
-  temp= malloc(inlength);
-  rest= malloc(inlength);
-
-  do {
-    /* If comment */
-    if((convert= sscanf(in_line, "#%[^\n\r]", rest))) {
-      free(temp); free(rest);
-      return;
-    }
-
-    /* If string */
-    if((convert= sscanf(in_line, "\"%[^\"\n\r]\" %[^\n\r]", temp, rest))) {
-      push_cstring(&(env->head), temp);
-      break;
-    }
-    /* If integer */
-    if((convert= sscanf(in_line, "%d %[^\n\r]", &itemp, rest))) {
-      push_int(&(env->head), itemp);
-      break;
-    }
-    /* Escape ';' with '\' */
-    if((convert= sscanf(in_line, "\\%c%[^\n\r]", temp, rest))) {
-      temp[1]= '\0';
-      push_sym(env, temp);
-      break;
-    } 
-    /* If symbol */
-    if((convert= sscanf(in_line, "%[^][ ;\n\r]%[^\n\r]", temp, rest))) {
-	push_sym(env, temp);
-	break;
-    }
-    /* If single char */
-    if((convert= sscanf(in_line, "%c%[^\n\r]", temp, rest))) {
-      if(*temp==';') {
-	if(!env->non_eval_flag) {
-	  eval(env);		/* Evaluate top element */
-	  break;
-	}
-	
-	push_sym(env, ";");
-	break;
-      }
-
-      if(*temp==']') {
-	push_sym(env, "[");
-	pack(env);
-	if(env->non_eval_flag)
-	  env->non_eval_flag--;
-	break;
-      }
-
-      if(*temp=='[') {
-	push_sym(env, "[");
-	env->non_eval_flag++;
-	break;
-      }
-    }
-  } while(0);
-
-  free(temp);
-
-  if(convert<2) {
-    free(rest);
-    return;
-  }
-   
-  stack_read(env, rest);
-  
-  free(rest);
-}
-
 /* Relocate elements of the list on the stack. */
 extern void expand(environment *env)
 {
@@ -765,7 +652,7 @@
   result= (left==right);
   
   toss(env); toss(env);
-  push_int(&(env->head), result);
+  push_int(env, result);
 }
 
 /* Negates the top element on the stack. */
@@ -787,7 +674,7 @@
 
   val= env->head->item->content.val;
   toss(env);
-  push_int(&(env->head), !val);
+  push_int(env, !val);
 }
 
 /* Compares the two top elements on the stack and return 0 if they're the
@@ -830,9 +717,22 @@
   toss(env); toss(env);
 } 
 
+extern void clear(environment *);
+void forget_sym(symbol **);
+
 /* Quit stack. */
 extern void quit(environment *env)
 {
+  long i;
+
+  clear(env);
+  if (env->err) return;
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    if (env->symbols[i]!= NULL) {
+      forget_sym(&(env->symbols[i]));
+      env->symbols[i]= NULL;
+    }
+  }
   exit(EXIT_SUCCESS);
 }
 
@@ -858,12 +758,25 @@
   }
 }
 
+/* Internal forget function */
+void forget_sym(symbol **hash_entry) {
+  symbol *temp;
+
+  temp= *hash_entry;
+  *hash_entry= (*hash_entry)->next;
+  
+  if(temp->val!=NULL) {
+    free_val(temp->val);
+  }
+  free(temp->id);
+  free(temp);
+}
+
 /* Forgets a symbol (remove it from the hash table) */
 extern void forget(environment *env)
 {
   char* sym_id;
   stackitem *stack_head= env->head;
-  symbol **hash_entry, *temp;
 
   if(stack_head==NULL) {
     printerr("Too Few Arguments");
@@ -880,20 +793,12 @@
   sym_id= ((symbol*)(stack_head->item->content.ptr))->id;
   toss(env);
 
-  hash_entry= hash(env->symbols, sym_id);
-  temp= *hash_entry;
-  *hash_entry= (*hash_entry)->next;
-  
-  if(temp->val!=NULL) {
-    free_val(temp->val);
-  }
-  free(temp->id);
-  free(temp);
+  return forget_sym(hash(env->symbols, sym_id));
 }
 
 /* Returns the current error number to the stack */
 extern void errn(environment *env){
-  push_int(&(env->head), env->err);
+  push_int(env, env->err);
 }
 
 extern void read(environment*);
@@ -905,12 +810,14 @@
   init_env(&myenv);
 
   while(1) {
-    fprintf(stderr, "okidok\n ");
+    if(myenv.in_string==NULL)
+      printstack(&myenv);
     read(&myenv);
     if(myenv.err) {
       printf("(error %d) ", myenv.err);
       myenv.err=0;
-    } else if(myenv.head->item->type==symb
+    } else if(myenv.head!=NULL
+	      && myenv.head->item->type==symb
 	      && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
       toss(&myenv); 		/* No error check in main */
       eval(&myenv);
@@ -946,7 +853,7 @@
     strcpy(new_string, b_val->content.ptr);
     strcat(new_string, a_val->content.ptr);
     free_val(a_val); free_val(b_val);
-    push_cstring(&(env->head), new_string);
+    push_cstring(env, new_string);
     free(new_string);
     return;
   }
@@ -966,7 +873,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), a+b);
+    push_int(env, a+b);
   }
 }
 
@@ -995,7 +902,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), b-a);
+    push_int(env, b-a);
   }
 }
 
@@ -1024,7 +931,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), b>a);
+    push_int(env, b>a);
   }
 }
 
@@ -1080,7 +987,7 @@
     env->err=1;
     return;
   }
-  push_val(&(env->head), copy_val(env->head->item));
+  push_val(env, copy_val(env->head->item));
 }
 
 /* "if", If-Then */
@@ -1171,7 +1078,7 @@
   toss(env); if(env->err) return;
 
   do {
-    push_val(&(env->head), test);
+    push_val(env, test);
     eval(env);
     
     if(env->head->item->type != integer) {
@@ -1184,7 +1091,7 @@
     toss(env); if(env->err) return;
     
     if(truth) {
-      push_val(&(env->head), loop);
+      push_val(env, loop);
       eval(env);
     } else {
       toss(env);
@@ -1225,8 +1132,8 @@
   iterator= foo->content.ptr;
 
   while(iterator!=NULL) {
-    push_val(&(env->head), iterator->item);
-    push_val(&(env->head), loop);
+    push_val(env, iterator->item);
+    push_val(env, loop);
     eval(env); if(env->err) return;
     iterator= iterator->next;
   }
@@ -1238,6 +1145,8 @@
 /* 'to' */
 extern void to(environment *env) {
   int i, start, ending;
+  stackitem *temp_head;
+  value *temp_val;
   
   if((env->head)==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
@@ -1257,18 +1166,23 @@
   start= env->head->item->content.val;
   toss(env); if(env->err) return;
 
-  push_sym(env, "[");
+  temp_head= env->head;
+  env->head= NULL;
 
   if(ending>=start) {
-    for(i= start; i<=ending; i++)
-      push_int(&(env->head), i);
+    for(i= ending; i>=start; i--)
+      push_int(env, i);
   } else {
-    for(i= start; i>=ending; i--)
-      push_int(&(env->head), i);
+    for(i= ending; i<=start; i++)
+      push_int(env, i);
   }
 
-  push_sym(env, "[");
-  pack(env); if(env->err) return;
+  temp_val= malloc(sizeof(value));
+  temp_val->content.ptr= env->head;
+  temp_val->refcount= 1;
+  temp_val->type= list;
+  env->head= temp_head;
+  push_val(env, temp_val);
 }
 
 /* Read a string */
@@ -1276,65 +1190,62 @@
   char in_string[101];
 
   fgets(in_string, 100, stdin);
-  push_cstring(&(env->head), in_string);
+  push_cstring(env, in_string);
 }
 
 /* Read a value and place on stack */
 extern void read(environment *env) {
-  const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%100c";
-  const char strform[]= "\"%[^\"]\"%100c";
-  const char intform[]= "%i%100c";
-  const char blankform[]= "%*[ \t]%100c";
-  const char ebrackform[]= "%*1[]]%100c";
-  const char semicform[]= "%*1[;]%100c";
-  const char bbrackform[]= "%*1[[]%100c";
+  const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%[\001-\377]";
+  const char strform[]= "\"%[^\"]\"%[\001-\377]";
+  const char intform[]= "%i%[\001-\377]";
+  const char blankform[]= "%*[ \t]%[\001-\377]";
+  const char ebrackform[]= "%*1[]]%[\001-\377]";
+  const char semicform[]= "%*1[;]%[\001-\377]";
+  const char bbrackform[]= "%*1[[]%[\001-\377]";
 
-  int itemp, rerun= 0;
+  int itemp;
   static int depth= 0;
   char *rest, *match;
-  static char *in_string= NULL;
   size_t inlength;
 
-  if(in_string==NULL) {
+  if(env->in_string==NULL) {
     readline(env); if(env->err) return;
     
-    in_string= malloc(strlen(env->head->item->content.ptr)+1);
-    strcpy(in_string, env->head->item->content.ptr);
+    env->in_string= malloc(strlen(env->head->item->content.ptr)+1);
+    strcpy(env->in_string, env->head->item->content.ptr);
     toss(env); if(env->err) return;
   }
   
-  inlength= strlen(in_string)+1;
+  inlength= strlen(env->in_string)+1;
   match= malloc(inlength);
   rest= malloc(inlength);
 
-  if(sscanf(in_string, blankform, rest)) {
-    rerun= 1;    
-  } else if(sscanf(in_string, intform, &itemp, rest) > 0) {
-    push_int(&(env->head), itemp);
-  } else if(sscanf(in_string, strform, match, rest) > 0) {
-    push_cstring(&(env->head), match);
-  } else if(sscanf(in_string, symbform, match, rest) > 0) {
+  if(sscanf(env->in_string, blankform, rest)) {
+    ; 
+  } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
+    push_int(env, itemp);
+  } else if(sscanf(env->in_string, strform, match, rest) > 0) {
+    push_cstring(env, match);
+  } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
     push_sym(env, match);
-  } else if(sscanf(in_string, ebrackform, rest) > 0) {
-    push_sym(env, "[");
+  } else if(sscanf(env->in_string, ebrackform, rest) > 0) {
     pack(env); if(env->err) return;
     if(depth!=0) depth--;
-  } else if(sscanf(in_string, semicform, rest) > 0) {
+  } else if(sscanf(env->in_string, semicform, rest) > 0) {
     push_sym(env, ";");
-  } else if(sscanf(in_string, bbrackform, rest) > 0) {
+  } else if(sscanf(env->in_string, bbrackform, rest) > 0) {
     push_sym(env, "[");
     depth++;
   } else {
     free(rest);
     rest= NULL;
-    rerun= 1;
   }
       
-  free(in_string);
+  free(env->in_string);
   free(match);
 
-  in_string= rest;
+  env->in_string= rest;
 
-  if(rerun || depth)
+  if(depth)
     return read(env);
 }