--- stack/stack.c 2002/02/11 00:54:04 1.69 +++ 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; iin_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);