--- stack/stack.c	2002/02/11 00:27:18	1.68
+++ stack/stack.c	2002/02/11 01:20:35	1.70
@@ -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++)
@@ -896,22 +898,26 @@
   push_int(&(env->head), env->err);
 }
 
+extern void read(environment*);
+
 int main()
 {
   environment myenv;
-  char in_string[100];
 
   init_env(&myenv);
 
-  printf("okidok\n ");
-
-  while(fgets(in_string, 100, stdin) != NULL) {
-    stack_read(&myenv, in_string);
+  while(1) {
+    if(myenv.in_string==NULL)
+      printf("okidok\n ");
+    read(&myenv);
     if(myenv.err) {
       printf("(error %d) ", myenv.err);
       myenv.err=0;
+    } else if(myenv.head->item->type==symb
+	      && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
+      toss(&myenv); 		/* No error check in main */
+      eval(&myenv);
     }
-    printf("okidok\n ");
   }
   quit(&myenv);
   return EXIT_FAILURE;
@@ -1289,48 +1295,46 @@
   int itemp, rerun= 0;
   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)) {
+  if(sscanf(env->in_string, blankform, rest)) {
     rerun= 1;    
-  } else if(sscanf(in_string, intform, &itemp, rest) > 0) {
+  } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
     push_int(&(env->head), itemp);
-  } else if(sscanf(in_string, strform, match, rest) > 0) {
+  } else if(sscanf(env->in_string, strform, match, rest) > 0) {
     push_cstring(&(env->head), match);
-  } else if(sscanf(in_string, symbform, match, rest) > 0) {
+  } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
     push_sym(env, match);
-  } else if(sscanf(in_string, ebrackform, rest) > 0) {
+  } 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(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)
     return read(env);