--- stack/stack.c 2002/02/12 22:13:12 1.72 +++ stack/stack.c 2002/02/12 23:16:56 1.73 @@ -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 */ @@ -1174,7 +1173,6 @@ push_int(env, i); } - push_sym(env, "["); pack(env); if(env->err) return; } @@ -1222,7 +1220,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) {