--- stack/stack.c	2002/02/11 01:20:35	1.70
+++ stack/stack.c	2002/02/12 23:59:05	1.74
@@ -9,7 +9,7 @@
 /* strcmp, strcpy, strlen, strcat, strdup */
 #include <string.h>
 
-#define HASHTBLSIZE 65536
+#define HASHTBLSIZE 2048
 
 /* First, define some types. */
 
@@ -156,23 +156,23 @@
 }
 
 /* Generic push function. */
-void push(stackitem** stack_head, stackitem* in_item)
+void push(environment *env, stackitem* in_item)
 {
-  in_item->next= *stack_head;
-  *stack_head= in_item;
+  in_item->next= env->head;
+  env->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);
+  push(env, 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));
@@ -182,11 +182,11 @@
   new_value->type= integer;
   new_value->refcount=1;
 
-  push(stack_head, new_item);
+  push(env, new_item);
 }
 
 /* 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));
@@ -197,7 +197,7 @@
   new_value->type= string;
   new_value->refcount=1;
 
-  push(stack_head, new_item);
+  push(env, new_item);
 }
 
 /* Mangle a symbol name to a valid C identifier name */
@@ -246,7 +246,7 @@
   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. */
@@ -313,7 +313,7 @@
       new_fvalue->refcount= 1;
     }
   }
-  push(&(env->head), new_item);
+  push(env, new_item);
 }
 
 /* Print newline. */
@@ -477,11 +477,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. */
@@ -490,7 +488,6 @@
   funcp in_func;
   value* temp_val;
   stackitem* iterator;
-  char* temp_string;
 
   if(env->head==NULL) {
     printerr("Too Few Arguments");
@@ -525,7 +522,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);
@@ -542,22 +539,7 @@
     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;
   }
 }
@@ -592,22 +574,21 @@
 /* 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 */
@@ -625,92 +606,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)
 {
@@ -767,7 +666,7 @@
   result= (left==right);
   
   toss(env); toss(env);
-  push_int(&(env->head), result);
+  push_int(env, result);
 }
 
 /* Negates the top element on the stack. */
@@ -789,7 +688,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
@@ -895,7 +794,7 @@
 
 /* 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*);
@@ -908,12 +807,13 @@
 
   while(1) {
     if(myenv.in_string==NULL)
-      printf("okidok\n ");
+      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);
@@ -949,7 +849,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;
   }
@@ -969,7 +869,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), a+b);
+    push_int(env, a+b);
   }
 }
 
@@ -998,7 +898,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), b-a);
+    push_int(env, b-a);
   }
 }
 
@@ -1027,7 +927,7 @@
     b=env->head->item->content.val;
     toss(env);
     if(env->err) return;
-    push_int(&(env->head), b>a);
+    push_int(env, b>a);
   }
 }
 
@@ -1083,7 +983,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 */
@@ -1174,7 +1074,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) {
@@ -1187,7 +1087,7 @@
     toss(env); if(env->err) return;
     
     if(truth) {
-      push_val(&(env->head), loop);
+      push_val(env, loop);
       eval(env);
     } else {
       toss(env);
@@ -1228,8 +1128,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;
   }
@@ -1241,6 +1141,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");
@@ -1260,18 +1162,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 */
@@ -1279,20 +1186,20 @@
   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;
   size_t inlength;
@@ -1310,15 +1217,14 @@
   rest= malloc(inlength);
 
   if(sscanf(env->in_string, blankform, rest)) {
-    rerun= 1;    
+    ; 
   } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
-    push_int(&(env->head), itemp);
+    push_int(env, itemp);
   } else if(sscanf(env->in_string, strform, match, rest) > 0) {
-    push_cstring(&(env->head), match);
+    push_cstring(env, match);
   } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
     push_sym(env, match);
   } else if(sscanf(env->in_string, ebrackform, rest) > 0) {
-    push_sym(env, "[");
     pack(env); if(env->err) return;
     if(depth!=0) depth--;
   } else if(sscanf(env->in_string, semicform, rest) > 0) {
@@ -1336,6 +1242,6 @@
 
   env->in_string= rest;
 
-  if(rerun || depth)
+  if(depth)
     return read(env);
 }