--- stack/stack.c	2002/02/07 04:34:42	1.48
+++ stack/stack.c	2002/02/08 05:12:37	1.60
@@ -1,14 +1,12 @@
-/* printf */
+/* printf, sscanf, fgets, fprintf */
 #include <stdio.h>
-/* EXIT_SUCCESS */
+/* exit, EXIT_SUCCESS, malloc, free */
 #include <stdlib.h>
 /* NULL */
 #include <stddef.h>
 /* dlopen, dlsym, dlerror */
 #include <dlfcn.h>
-/* assert */
-#include <assert.h>
-/* strcat */
+/* strcmp, strcpy, strlen, strcat, strdup */
 #include <string.h>
 
 #define HASHTBLSIZE 65536
@@ -50,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;
 
@@ -101,7 +100,9 @@
       }
       free(val);		/* Free the actual list value */
       break;
-    default:
+    case integer:
+    case func:
+    case symb:
       break;
     }
   }
@@ -198,17 +199,17 @@
 }
 
 /* Mangle a symbol name to a valid C identifier name */
-char *mangle_(const char *old_string){
+char *mangle_str(const char *old_string){
   char validchars[]
     ="0123456789abcdef";
   char *new_string, *current;
 
-  new_string=malloc(strlen(old_string)+4);
+  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[0]=validchars[(unsigned char)(old_string[0])/16];
+    current[1]=validchars[(unsigned char)(old_string[0])%16];
     current+=2;
     old_string++;
   }
@@ -233,7 +234,7 @@
     return;
   }
 
-  new_string= mangle_((const char *)(env->head->item->content.ptr));
+  new_string= mangle_str((const char *)(env->head->item->content.ptr));
 
   toss(env);
   if(env->err) return;
@@ -296,7 +297,7 @@
     funcptr= dlsym(handle, in_string); /* Get function pointer */
     dlerr=dlerror();
     if(dlerr != NULL) {		/* If no function was found */
-      mangled=mangle_(in_string);
+      mangled=mangle_str(in_string);
       funcptr= dlsym(handle, mangled); /* try mangling it */
       free(mangled);
       dlerr=dlerror();
@@ -346,9 +347,6 @@
   case list:
     push_sym(env, "list");
     break;
-  default:
-    push_sym(env, "unknown");
-    break;
   }
 }    
 
@@ -360,7 +358,7 @@
     printf("%d", stack_head->item->content.val);
     break;
   case string:
-    printf("\"%s\"", (char*)stack_head->item->content.ptr);
+    printf("%s", (char*)stack_head->item->content.ptr);
     break;
   case symb:
     printf("%s", ((symbol *)(stack_head->item->content.ptr))->id);
@@ -379,9 +377,6 @@
     }
     printf("]");
     break;
-  default:
-    printf("#<unknown %p>", (stack_head->item->content.ptr));
-    break;
   }
 }
 
@@ -438,6 +433,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)
 {
@@ -490,18 +502,16 @@
     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;
+      return eval(env);		/* evaluate the value */
     }
-    break;
+    return;
 
     /* 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;
+    return (*in_func)(env);
 
     /* If it's a list */
   case list:
@@ -510,19 +520,23 @@
     toss(env);
     if(env->err) return;
     iterator= (stackitem*)temp_val->content.ptr;
-    while(iterator!=NULL && iterator->item!=NULL) {
+    while(iterator!=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;
+	if(iterator->next == NULL){
+	  free_val(temp_val);
+	  return eval(env);
+	}
 	eval(env);
 	if(env->err) return;
       }
       iterator= iterator->next;
     }
     free_val(temp_val);
-    break;
+    return;
 
     /* If it's a string */
   case string:
@@ -531,17 +545,16 @@
     toss(env);
     if(env->err) return;
     temp_string= malloc(strlen((char*)temp_val->content.ptr)+5);
-    strcat(temp_string, "[ ");
-    strcat(temp_string, (char*)temp_val->content.ptr);
+    strcpy(temp_string, "[ ");
+    strcpy(temp_string+2, (char*)temp_val->content.ptr);
+    free_val(temp_val);
     strcat(temp_string, " ]");
     stack_read(env, temp_string);
-    eval(env);
-    if(env->err) return;
-    free_val(temp_val);
     free(temp_string);
-    break;
+    return eval(env);
 
-  default:
+  case integer:
+    return;
   }
 }
 
@@ -905,12 +918,33 @@
 /* + */
 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) {
@@ -926,3 +960,185 @@
   if(env->err) return;
   push_int(&(env->head), a+b);
 }
+
+/* - */
+extern void sx_2d(environment *env) {
+  int a;
+
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    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;
+  env->head->item->content.val -= a;
+}
+
+/* Return copy of a value */
+value *copy_val(value *old_value){
+  stackitem *old_item, *new_item, *prev_item;
+
+  value *new_value=malloc(sizeof(value));
+
+  new_value->type=old_value->type;
+  new_value->refcount=0;	/* This is increased if/when this
+				   value is referenced somewhere, like
+				   in a stack item or a variable */
+  switch(old_value->type){
+  case integer:
+    new_value->content.val=old_value->content.val;
+    break;
+  case string:
+    (char *)(new_value->content.ptr)
+      = strdup((char *)(old_value->content.ptr));
+    break;
+  case func:
+  case symb:
+    new_value->content.ptr=old_value->content.ptr;
+    break;
+  case list:
+    new_value->content.ptr=NULL;
+
+    prev_item=NULL;
+    old_item=(stackitem *)(old_value->content.ptr);
+
+    while(old_item != NULL) {	/* While list is not empty */
+      new_item= malloc(sizeof(stackitem));
+      new_item->item=copy_val(old_item->item); /* recurse */
+      new_item->next=NULL;
+      if(prev_item != NULL)	/* If this wasn't the first item */
+	prev_item->next=new_item; /* point the previous item to the
+                                     new item */
+      else
+	new_value->content.ptr=new_item;
+      old_item=old_item->next;
+      prev_item=new_item;
+    }	  
+    break;
+  }
+  return new_value;
+}
+
+/* duplicates an item on the stack */
+extern void dup(environment *env) {
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  push_val(&(env->head), copy_val(env->head->item));
+}
+
+/* "if", If-Then */
+extern void sx_6966(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 ifelse(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);
+}
+
+/* while */
+extern void sx_7768696c65(environment *env) {
+
+  int truth;
+
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  do {
+    swap(env); if(env->err) return;
+    dup(env); if(env->err) return;
+    eval(env); if(env->err) return;
+    
+    if(env->head->item->type != integer) {
+      printerr("Bad Argument Type");
+      env->err=2;
+      return;
+    }
+    
+    truth= env->head->item->content.val;
+    
+    toss(env); if(env->err) return;
+    swap(env); if(env->err) return;
+    
+    if(truth) {
+      dup(env);
+      eval(env);
+    } else {
+      toss(env);
+      toss(env);
+    }
+  
+  } while(truth);
+}