--- stack/stack.c 2002/02/11 00:54:04 1.69 +++ stack/stack.c 2002/02/11 22:07:47 1.71 @@ -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; ihead), 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 +488,6 @@ funcp in_func; value* temp_val; stackitem* iterator; - char* temp_string; if(env->head==NULL) { printerr("Too Few Arguments"); @@ -540,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; } } @@ -630,85 +614,6 @@ 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) { @@ -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); @@ -1281,60 +1188,58 @@ /* 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) { + if(sscanf(env->in_string, blankform, rest)) { + ; + } 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) + if(depth) return read(env); }