--- stack/stack.c	2002/02/14 12:20:09	1.80
+++ stack/stack.c	2002/02/14 19:20:28	1.81
@@ -58,7 +58,6 @@
   stackitem *head;		/* Head of the stack */
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
-  int non_eval_flag;
   char *in_string;		/* Input pending to be read */
   char *free_string;		/* Free this string when all input is
                                    read from in_string */
@@ -75,7 +74,6 @@
 
   env->in_string= NULL;
   env->err= 0;
-  env->non_eval_flag= 0;
   for(i= 0; i<HASHTBLSIZE; i++)
     env->symbols[i]= NULL;
 }
@@ -102,13 +100,15 @@
 	free(item);		/* free the stackitem */
 	item=temp;		/* go to next stackitem */
       }
-      free(val);		/* Free the actual list value */
       break;
     case integer:
     case func:
     case symb:
       break;
     }
+    if(val->id!=NULL)
+      free(val->id);
+    free(val);		/* Free the actual list value */
   }
 }
 
@@ -174,7 +174,8 @@
   
   new_value->content.val= in_val;
   new_value->type= integer;
-  new_value->refcount=1;
+  new_value->refcount= 1;
+  new_value->id= NULL;
 
   push_val(env, new_value);
 }
@@ -187,7 +188,8 @@
   new_value->content.ptr= malloc(strlen(in_string)+1);
   strcpy(new_value->content.ptr, in_string);
   new_value->type= string;
-  new_value->refcount=1;
+  new_value->refcount= 1;
+  new_value->id= NULL;
 
   push_val(env, new_value);
 }
@@ -213,7 +215,6 @@
 }
 
 extern void mangle(environment *env){
-  value *new_value;
   char *new_string;
 
   if((env->head)==NULL) {
@@ -233,12 +234,7 @@
   toss(env);
   if(env->err) return;
 
-  new_value= malloc(sizeof(value));
-  new_value->content.ptr= new_string;
-  new_value->type= string;
-  new_value->refcount=1;
-
-  push_val(env, new_value);
+  push_cstring(env, new_string);
 }
 
 /* Push a symbol onto the stack. */