--- stack/stack.c 2002/02/12 22:13:12 1.72 +++ stack/stack.c 2002/02/12 23:59:05 1.74 @@ -574,22 +574,21 @@ /* Make a list. */ extern void pack(environment *env) { - void* delimiter; stackitem *iterator, *temp; value *pack; - delimiter= env->head->item->content.ptr; /* Get delimiter */ - toss(env); - iterator= env->head; - if(iterator==NULL || iterator->item->content.ptr==delimiter) { + if(iterator==NULL + || (iterator->item->type==symb + && ((symbol*)(iterator->item->content.ptr))->id[0]=='[')) { temp= NULL; toss(env); } else { /* Search for first delimiter */ while(iterator->next!=NULL - && iterator->next->item->content.ptr!=delimiter) + && (iterator->next->item->type!=symb + || ((symbol*)(iterator->next->item->content.ptr))->id[0]!='[')) iterator= iterator->next; /* Extract list */ @@ -607,10 +606,7 @@ pack->content.ptr= temp; pack->refcount= 1; - temp= malloc(sizeof(stackitem)); - temp->item= pack; - - push(env, temp); + push_val(env, pack); rev(env); } @@ -1145,6 +1141,8 @@ /* 'to' */ extern void to(environment *env) { int i, start, ending; + stackitem *temp_head; + value *temp_val; if((env->head)==NULL || env->head->next==NULL) { printerr("Too Few Arguments"); @@ -1164,18 +1162,23 @@ start= env->head->item->content.val; toss(env); if(env->err) return; - push_sym(env, "["); + temp_head= env->head; + env->head= NULL; if(ending>=start) { - for(i= start; i<=ending; i++) + for(i= ending; i>=start; i--) push_int(env, i); } else { - for(i= start; i>=ending; i--) + for(i= ending; i<=start; i++) push_int(env, i); } - push_sym(env, "["); - pack(env); if(env->err) return; + temp_val= malloc(sizeof(value)); + temp_val->content.ptr= env->head; + temp_val->refcount= 1; + temp_val->type= list; + env->head= temp_head; + push_val(env, temp_val); } /* Read a string */ @@ -1222,7 +1225,6 @@ } else if(sscanf(env->in_string, symbform, match, rest) > 0) { push_sym(env, match); } 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(env->in_string, semicform, rest) > 0) {