--- stack/stack.c	2002/02/06 23:27:22	1.43
+++ stack/stack.c	2002/02/07 23:52:20	1.50
@@ -8,6 +8,8 @@
 #include <dlfcn.h>
 /* assert */
 #include <assert.h>
+/* strcat */
+#include <string.h>
 
 #define HASHTBLSIZE 65536
 
@@ -57,6 +59,7 @@
   stackitem *head;		/* Head of the stack */
   hashtbl symbols;		/* Hash table of all variable bindings */
   int err;			/* Error flag */
+  int non_eval_flag;
 } environment;
 
 /* A type for pointers to external functions */
@@ -66,18 +69,65 @@
 /* Initialize a newly created environment */
 void init_env(environment *env)
 {
-  long i;
+  int i;
 
-  env->err=0;
+  env->err= 0;
+  env->non_eval_flag= 0;
   for(i= 0; i<HASHTBLSIZE; i++)
     env->symbols[i]= NULL;
 }
 
+void printerr(const char* in_string) {
+  fprintf(stderr, "Err: %s\n", in_string);
+}
+
+/* Throw away a value */
+void free_val(value *val){
+  stackitem *item, *temp;
+
+  val->refcount--;		/* Decrease the reference count */
+  if(val->refcount == 0){
+    switch (val->type){		/* and free the contents if necessary */
+    case string:
+      free(val->content.ptr);
+      break;
+    case list:			/* lists needs to be freed recursively */
+      item=val->content.ptr;
+      while(item != NULL) {	/* for all stack items */
+	free_val(item->item);	/* free the value */
+	temp=item->next;	/* save next ptr */
+	free(item);		/* free the stackitem */
+	item=temp;		/* go to next stackitem */
+      }
+      free(val);		/* Free the actual list value */
+      break;
+    default:
+      break;
+    }
+  }
+}
+
+/* Discard the top element of the stack. */
+extern void toss(environment *env)
+{
+  stackitem *temp= env->head;
+
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  
+  free_val(env->head->item);	/* Free the value */
+  env->head= env->head->next;	/* Remove the top stack item */
+  free(temp);			/* Free the old top stack item */
+}
+
 /* Returns a pointer to a pointer to an element in the hash table. */
 symbol **hash(hashtbl in_hashtbl, const char *in_string)
 {
-  long i= 0;
-  unsigned long out_hash= 0;
+  int i= 0;
+  unsigned int out_hash= 0;
   char key= '\0';
   symbol **position;
   
@@ -147,6 +197,55 @@
   push(stack_head, new_item);
 }
 
+/* Mangle a symbol name to a valid C identifier name */
+char *mangle_(const char *old_string){
+  char validchars[]
+    ="0123456789abcdef";
+  char *new_string, *current;
+
+  new_string=malloc((strlen(old_string)*2)+4);
+  strcpy(new_string, "sx_");	/* Stack eXternal */
+  current=new_string+3;
+  while(old_string[0] != '\0'){
+    current[0]=validchars[old_string[0]/16];
+    current[1]=validchars[old_string[0]%16];
+    current+=2;
+    old_string++;
+  }
+  current[0]='\0';
+
+  return new_string;		/* The caller must free() it */
+}
+
+extern void mangle(environment *env){
+  value *new_value;
+  char *new_string;
+
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  if(env->head->item->type!=string) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
+  new_string= mangle_((const char *)(env->head->item->content.ptr));
+
+  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->head), new_value);
+}
+
 /* Push a symbol onto the stack. */
 void push_sym(environment *env, const char *in_string)
 {
@@ -161,6 +260,8 @@
   void *funcptr;		/* A function pointer */
 
   static void *handle= NULL;	/* Dynamic linker handle */
+  const char *dlerr;		/* Dynamic linker error */
+  char *mangled;		/* Mangled function name */
 
   /* Create a new stack item containing a new value */
   new_item= malloc(sizeof(stackitem));
@@ -193,7 +294,14 @@
       handle= dlopen(NULL, RTLD_LAZY);
 
     funcptr= dlsym(handle, in_string); /* Get function pointer */
-    if(dlerror()==NULL) { 	/* If a function was found */
+    dlerr=dlerror();
+    if(dlerr != NULL) {		/* If no function was found */
+      mangled=mangle_(in_string);
+      funcptr= dlsym(handle, mangled); /* try mangling it */
+      free(mangled);
+      dlerr=dlerror();
+    }
+    if(dlerr==NULL) {		/* If a function was found */
       new_fvalue= malloc(sizeof(value)); /* Create a new value */
       new_fvalue->type=func;	/* The new value is a function pointer */
       new_fvalue->content.ptr=funcptr; /* Store function pointer */
@@ -205,52 +313,6 @@
   push(&(env->head), new_item);
 }
 
-void printerr(const char* in_string) {
-  fprintf(stderr, "Err: %s\n", in_string);
-}
-
-/* Throw away a value */
-void free_val(value *val){
-  stackitem *item, *temp;
-
-  val->refcount--;		/* Decrease the reference count */
-  if(val->refcount == 0){
-    switch (val->type){		/* and free the contents if necessary */
-    case string:
-      free(val->content.ptr);
-      break;
-    case list:			/* lists needs to be freed recursively */
-      item=val->content.ptr;
-      while(item != NULL) {	/* for all stack items */
-	free_val(item->item);	/* free the value */
-	temp=item->next;	/* save next ptr */
-	free(item);		/* free the stackitem */
-	item=temp;		/* go to next stackitem */
-      }
-      free(val);		/* Free the actual list value */
-      break;
-    default:
-      break;
-    }
-  }
-}
-
-/* Discard the top element of the stack. */
-extern void toss(environment *env)
-{
-  stackitem *temp= env->head;
-
-  if((env->head)==NULL) {
-    printerr("Too Few Arguments");
-    env->err=1;
-    return;
-  }
-  
-  free_val(env->head->item);	/* Free the value */
-  env->head= env->head->next;	/* Remove the top stack item */
-  free(temp);			/* Free the old top stack item */
-}
-
 /* Print newline. */
 extern void nl()
 {
@@ -301,7 +363,7 @@
     printf("\"%s\"", (char*)stack_head->item->content.ptr);
     break;
   case symb:
-    printf("'%s'", ((symbol *)(stack_head->item->content.ptr))->id);
+    printf("%s", ((symbol *)(stack_head->item->content.ptr))->id);
     break;
   case func:
     printf("#<function %p>", (funcp)(stack_head->item->content.ptr));
@@ -350,8 +412,6 @@
   nl();
 }
 
-
-
 /* Prints the stack. */
 extern void printstack(environment *env)
 {
@@ -367,13 +427,7 @@
 {
   stackitem *temp= env->head;
   
-  if((env->head)==NULL) {
-    printerr("Too Few Arguments");
-    env->err=1;
-    return;
-  }
-
-  if(env->head->next==NULL) {
+  if(env->head==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
@@ -384,16 +438,6 @@
   env->head->next= temp;
 } 
 
-stackitem* copy(stackitem* in_item)
-{
-  stackitem *out_item= malloc(sizeof(stackitem));
-
-  memcpy(out_item, in_item, sizeof(stackitem));
-  out_item->next= NULL;
-
-  return out_item;
-}
-
 /* Recall a value from a symbol, if bound */
 extern void rcl(environment *env)
 {
@@ -422,39 +466,86 @@
   push_val(&(env->head), val); /* Return its bound value */
 }
 
+void stack_read(environment*, char*);
+
 /* If the top element is a symbol, determine if it's bound to a
    function value, and if it is, toss the symbol and execute the
    function. */
 extern void eval(environment *env)
 {
   funcp in_func;
+  value* temp_val;
+  stackitem* iterator;
+  char* temp_string;
+
   if(env->head==NULL) {
     printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
-  /* if it's a symbol */
-  if(env->head->item->type==symb) {
-
+  switch(env->head->item->type) {
+    /* if it's a symbol */
+  case symb:
     rcl(env);			/* get its contents */
     if(env->err) return;
     if(env->head->item->type!=symb){ /* don't recurse symbols */
       eval(env);			/* evaluate the value */
       return;
     }
-  }
+    break;
 
-  /* If it's a lone function value, run it */
-  if(env->head->item->type==func) {
+    /* If it's a lone function value, run it */
+  case func:
     in_func= (funcp)(env->head->item->content.ptr);
     toss(env); 
     if(env->err) return;
     (*in_func)(env);
+    break;
+
+    /* If it's a list */
+  case list:
+    temp_val= env->head->item;
+    env->head->item->refcount++;
+    toss(env);
+    if(env->err) return;
+    iterator= (stackitem*)temp_val->content.ptr;
+    while(iterator!=NULL && iterator->item!=NULL) {
+      push_val(&(env->head), iterator->item);
+      if(env->head->item->type==symb
+	&& strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {
+	toss(env);
+	if(env->err) return;
+	eval(env);
+	if(env->err) return;
+      }
+      iterator= iterator->next;
+    }
+    free_val(temp_val);
+    break;
+
+    /* If it's a string */
+  case string:
+    temp_val= env->head->item;
+    env->head->item->refcount++;
+    toss(env);
+    if(env->err) return;
+    temp_string= malloc(strlen((char*)temp_val->content.ptr)+5);
+    strcpy(temp_string, "[ ");
+    strcat(temp_string, (char*)temp_val->content.ptr);
+    strcat(temp_string, " ]");
+    stack_read(env, temp_string);
+    eval(env);
+    if(env->err) return;
+    free_val(temp_val);
+    free(temp_string);
+    break;
+
+  default:
   }
 }
 
-/* Reverse a list */
+/* Reverse (flip) a list */
 extern void rev(environment *env){
   stackitem *old_head, *new_head, *item;
 
@@ -531,7 +622,6 @@
   int itemp;
   size_t inlength= strlen(in_line)+1;
   int convert= 0;
-  static int non_eval_flag= 0;
 
   temp= malloc(inlength);
   rest= malloc(inlength);
@@ -567,7 +657,7 @@
     /* If single char */
     if((convert= sscanf(in_line, "%c%[^\n\r]", temp, rest))) {
       if(*temp==';') {
-	if(!non_eval_flag) {
+	if(!env->non_eval_flag) {
 	  eval(env);		/* Evaluate top element */
 	  break;
 	}
@@ -579,14 +669,14 @@
       if(*temp==']') {
 	push_sym(env, "[");
 	pack(env);
-	if(non_eval_flag!=0)
-	  non_eval_flag--;
+	if(env->non_eval_flag)
+	  env->non_eval_flag--;
 	break;
       }
 
       if(*temp=='[') {
 	push_sym(env, "[");
-	non_eval_flag++;
+	env->non_eval_flag++;
 	break;
       }
     }
@@ -811,3 +901,49 @@
   quit(&myenv);
   return EXIT_FAILURE;
 }
+
+/* + */
+extern void sx_2b(environment *env) {
+  int a, b;
+  size_t len;
+  char* new_string;
+  value *a_val, *b_val;
+
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  if(env->head->item->type==string
+     && env->head->next->item->type==string) {
+    a_val= env->head->item;
+    b_val= env->head->next->item;
+    a_val->refcount++;
+    b_val->refcount++;
+    toss(env); if(env->err) return;
+    toss(env); if(env->err) return;
+    len= strlen(a_val->content.ptr)+strlen(b_val->content.ptr)+1;
+    new_string= malloc(len);
+    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);
+    free(new_string);
+    return;
+  }
+  
+  if(env->head->item->type!=integer
+     || env->head->next->item->type!=integer) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+  a=env->head->item->content.val;
+  toss(env);
+  if(env->err) return;
+  b=env->head->item->content.val;
+  toss(env);
+  if(env->err) return;
+  push_int(&(env->head), a+b);
+}