--- stack/stack.c 2002/02/11 22:07:47 1.71 +++ stack/stack.c 2002/02/12 22:13:12 1.72 @@ -9,7 +9,7 @@ /* strcmp, strcpy, strlen, strcat, strdup */ #include -#define HASHTBLSIZE 65536 +#define HASHTBLSIZE 2048 /* First, define some types. */ @@ -156,23 +156,23 @@ } /* Generic push function. */ -void push(stackitem** stack_head, stackitem* in_item) +void push(environment *env, stackitem* in_item) { - in_item->next= *stack_head; - *stack_head= in_item; + in_item->next= env->head; + env->head= in_item; } /* Push a value onto the stack */ -void push_val(stackitem **stack_head, value *val) +void push_val(environment *env, value *val) { stackitem *new_item= malloc(sizeof(stackitem)); new_item->item= val; val->refcount++; - push(stack_head, new_item); + push(env, new_item); } /* Push an integer onto the stack. */ -void push_int(stackitem **stack_head, int in_val) +void push_int(environment *env, int in_val) { value *new_value= malloc(sizeof(value)); stackitem *new_item= malloc(sizeof(stackitem)); @@ -182,11 +182,11 @@ new_value->type= integer; new_value->refcount=1; - push(stack_head, new_item); + push(env, new_item); } /* Copy a string onto the stack. */ -void push_cstring(stackitem **stack_head, const char *in_string) +void push_cstring(environment *env, const char *in_string) { value *new_value= malloc(sizeof(value)); stackitem *new_item= malloc(sizeof(stackitem)); @@ -197,7 +197,7 @@ new_value->type= string; new_value->refcount=1; - push(stack_head, new_item); + push(env, new_item); } /* Mangle a symbol name to a valid C identifier name */ @@ -246,7 +246,7 @@ new_value->type= string; new_value->refcount=1; - push_val(&(env->head), new_value); + push_val(env, new_value); } /* Push a symbol onto the stack. */ @@ -313,7 +313,7 @@ new_fvalue->refcount= 1; } } - push(&(env->head), new_item); + push(env, new_item); } /* Print newline. */ @@ -477,7 +477,7 @@ } toss(env); /* toss the symbol */ if(env->err) return; - push_val(&(env->head), val); /* Return its bound value */ + push_val(env, val); /* Return its bound value */ } /* If the top element is a symbol, determine if it's bound to a @@ -522,7 +522,7 @@ if(env->err) return; iterator= (stackitem*)temp_val->content.ptr; while(iterator!=NULL) { - push_val(&(env->head), iterator->item); + push_val(env, iterator->item); if(env->head->item->type==symb && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) { toss(env); @@ -610,7 +610,7 @@ temp= malloc(sizeof(stackitem)); temp->item= pack; - push(&(env->head), temp); + push(env, temp); rev(env); } @@ -670,7 +670,7 @@ result= (left==right); toss(env); toss(env); - push_int(&(env->head), result); + push_int(env, result); } /* Negates the top element on the stack. */ @@ -692,7 +692,7 @@ val= env->head->item->content.val; toss(env); - push_int(&(env->head), !val); + push_int(env, !val); } /* Compares the two top elements on the stack and return 0 if they're the @@ -798,7 +798,7 @@ /* Returns the current error number to the stack */ extern void errn(environment *env){ - push_int(&(env->head), env->err); + push_int(env, env->err); } extern void read(environment*); @@ -853,7 +853,7 @@ strcpy(new_string, b_val->content.ptr); strcat(new_string, a_val->content.ptr); free_val(a_val); free_val(b_val); - push_cstring(&(env->head), new_string); + push_cstring(env, new_string); free(new_string); return; } @@ -873,7 +873,7 @@ b=env->head->item->content.val; toss(env); if(env->err) return; - push_int(&(env->head), a+b); + push_int(env, a+b); } } @@ -902,7 +902,7 @@ b=env->head->item->content.val; toss(env); if(env->err) return; - push_int(&(env->head), b-a); + push_int(env, b-a); } } @@ -931,7 +931,7 @@ b=env->head->item->content.val; toss(env); if(env->err) return; - push_int(&(env->head), b>a); + push_int(env, b>a); } } @@ -987,7 +987,7 @@ env->err=1; return; } - push_val(&(env->head), copy_val(env->head->item)); + push_val(env, copy_val(env->head->item)); } /* "if", If-Then */ @@ -1078,7 +1078,7 @@ toss(env); if(env->err) return; do { - push_val(&(env->head), test); + push_val(env, test); eval(env); if(env->head->item->type != integer) { @@ -1091,7 +1091,7 @@ toss(env); if(env->err) return; if(truth) { - push_val(&(env->head), loop); + push_val(env, loop); eval(env); } else { toss(env); @@ -1132,8 +1132,8 @@ iterator= foo->content.ptr; while(iterator!=NULL) { - push_val(&(env->head), iterator->item); - push_val(&(env->head), loop); + push_val(env, iterator->item); + push_val(env, loop); eval(env); if(env->err) return; iterator= iterator->next; } @@ -1168,10 +1168,10 @@ if(ending>=start) { for(i= start; i<=ending; i++) - push_int(&(env->head), i); + push_int(env, i); } else { for(i= start; i>=ending; i--) - push_int(&(env->head), i); + push_int(env, i); } push_sym(env, "["); @@ -1183,7 +1183,7 @@ char in_string[101]; fgets(in_string, 100, stdin); - push_cstring(&(env->head), in_string); + push_cstring(env, in_string); } /* Read a value and place on stack */ @@ -1216,9 +1216,9 @@ if(sscanf(env->in_string, blankform, rest)) { ; } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) { - push_int(&(env->head), itemp); + push_int(env, itemp); } else if(sscanf(env->in_string, strform, match, rest) > 0) { - push_cstring(&(env->head), match); + push_cstring(env, match); } else if(sscanf(env->in_string, symbform, match, rest) > 0) { push_sym(env, match); } else if(sscanf(env->in_string, ebrackform, rest) > 0) {