--- stack/stack.c	2002/02/09 00:57:05	1.67
+++ 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;
@@ -1267,3 +1273,69 @@
   push_sym(env, "[");
   pack(env); if(env->err) return;
 }
+
+/* Read a string */
+extern void readline(environment *env) {
+  char in_string[101];
+
+  fgets(in_string, 100, stdin);
+  push_cstring(&(env->head), 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";
+
+  int itemp, rerun= 0;
+  static int depth= 0;
+  char *rest, *match;
+  size_t inlength;
+
+  if(env->in_string==NULL) {
+    readline(env); if(env->err) return;
+    
+    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(env->in_string)+1;
+  match= malloc(inlength);
+  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);
+  } else if(sscanf(env->in_string, strform, match, rest) > 0) {
+    push_cstring(&(env->head), 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) {
+    push_sym(env, ";");
+  } else if(sscanf(env->in_string, bbrackform, rest) > 0) {
+    push_sym(env, "[");
+    depth++;
+  } else {
+    free(rest);
+    rest= NULL;
+  }
+      
+  free(env->in_string);
+  free(match);
+
+  env->in_string= rest;
+
+  if(rerun || depth)
+    return read(env);
+}