--- stack/stack.c 2002/02/08 00:59:34 1.55 +++ stack/stack.c 2002/02/08 02:28:41 1.56 @@ -48,6 +48,7 @@ typedef struct stackitem_struct { value *item; /* The value on the stack */ + /* (This is never NULL) */ struct stackitem_struct *next; /* Next item */ } stackitem; @@ -438,6 +439,23 @@ env->head->next= temp; } +/* Rotate the first three elements on the stack. */ +extern void rot(environment *env) +{ + stackitem *temp= env->head; + + if(env->head==NULL || env->head->next==NULL + || env->head->next->next==NULL) { + printerr("Too Few Arguments"); + env->err=1; + return; + } + + env->head= env->head->next->next; + temp->next->next= env->head->next; + env->head->next= temp; +} + /* Recall a value from a symbol, if bound */ extern void rcl(environment *env) { @@ -1003,3 +1021,72 @@ } push_val(&(env->head), copy_val(env->head->item)); } + +/* If-Then */ +extern void ift(environment *env) { + + int truth; + + if((env->head)==NULL || env->head->next==NULL) { + printerr("Too Few Arguments"); + env->err=1; + return; + } + + if(env->head->next->item->type != integer) { + printerr("Bad Argument Type"); + env->err=2; + return; + } + + swap(env); + if(env->err) return; + + truth=env->head->item->content.val; + + toss(env); + if(env->err) return; + + if(truth) + eval(env); + else + toss(env); +} + + +/* If-Then-Else */ +extern void ifte(environment *env) { + + int truth; + + if((env->head)==NULL || env->head->next==NULL + || env->head->next->next==NULL) { + printerr("Too Few Arguments"); + env->err=1; + return; + } + + if(env->head->next->next->item->type != integer) { + printerr("Bad Argument Type"); + env->err=2; + return; + } + + rot(env); + if(env->err) return; + + truth=env->head->item->content.val; + + toss(env); + if(env->err) return; + + if(!truth) + swap(env); + if(env->err) return; + + toss(env); + if(env->err) return; + + eval(env); +} +