--- stack/stack.c 2002/02/06 11:15:05 1.38 +++ stack/stack.c 2002/02/07 01:06:44 1.45 @@ -301,7 +301,7 @@ printf("\"%s\"", (char*)stack_head->item->content.ptr); break; case symb: - printf("'%s'", ((symbol *)(stack_head->item->content.ptr))->id); + printf("%s", ((symbol *)(stack_head->item->content.ptr))->id); break; case func: printf("#", (funcp)(stack_head->item->content.ptr)); @@ -315,7 +315,7 @@ printf(" "); stack_head=stack_head->next; } - printf("] "); + printf("]"); break; default: printf("#", (stack_head->item->content.ptr)); @@ -428,6 +428,9 @@ extern void eval(environment *env) { funcp in_func; + value* temp_val; + stackitem* iterator; + if(env->head==NULL) { printerr("Too Few Arguments"); env->err=1; @@ -451,9 +454,57 @@ toss(env); if(env->err) return; (*in_func)(env); + return; + } + + /* If it's a list */ + if(env->head->item->type==list) { + temp_val= env->head->item; + env->head->item->refcount++; + toss(env); + if(env->err) return; + iterator= (stackitem*)temp_val->content.ptr; + while(iterator!=NULL && iterator->item!=NULL) { + push_val(&(env->head), iterator->item); + if(env->head->item->type==symb + && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) { + toss(env); + if(env->err) return; + eval(env); + } + iterator= iterator->next; + } + free_val(temp_val); } } +/* Reverse (flip) a list */ +extern void rev(environment *env){ + stackitem *old_head, *new_head, *item; + + if((env->head)==NULL) { + printerr("Too Few Arguments"); + env->err=1; + return; + } + + if(env->head->item->type!=list) { + printerr("Bad Argument Type"); + env->err=2; + return; + } + + old_head=(stackitem *)(env->head->item->content.ptr); + new_head=NULL; + while(old_head != NULL){ + item=old_head; + old_head=old_head->next; + item->next=new_head; + new_head=item; + } + env->head->item->content.ptr=new_head; +} + /* Make a list. */ extern void pack(environment *env) { @@ -494,6 +545,7 @@ temp->item= pack; push(&(env->head), temp); + rev(env); } /* Parse input. */ @@ -509,6 +561,12 @@ 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); @@ -587,6 +645,11 @@ return; } + rev(env); + + if(env->err) + return; + /* The first list element is the new stack head */ new_head= temp= env->head->item->content.ptr; @@ -769,6 +832,6 @@ } printf("okidok\n "); } - - exit(EXIT_SUCCESS); + quit(&myenv); + return EXIT_FAILURE; }