--- stack/stack.c 2002/02/09 00:57:05 1.67 +++ stack/stack.c 2002/02/11 00:27:18 1.68 @@ -1267,3 +1267,71 @@ 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; + static char *in_string= NULL; + size_t inlength; + + if(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); + toss(env); if(env->err) return; + } + + inlength= strlen(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) { + push_int(&(env->head), itemp); + } else if(sscanf(in_string, strform, match, rest) > 0) { + push_cstring(&(env->head), match); + } else if(sscanf(in_string, symbform, match, rest) > 0) { + push_sym(env, match); + } else if(sscanf(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) { + push_sym(env, ";"); + } else if(sscanf(in_string, bbrackform, rest) > 0) { + push_sym(env, "["); + depth++; + } else { + free(rest); + rest= NULL; + rerun= 1; + } + + free(in_string); + free(match); + + in_string= rest; + + if(rerun || depth) + return read(env); +}