--- stack/stack.c	2002/01/31 23:09:07	1.17
+++ stack/stack.c	2002/02/17 04:03:57	1.89
@@ -1,55 +1,66 @@
-/* printf */
+/* printf, sscanf, fgets, fprintf, fopen, perror */
 #include <stdio.h>
-/* EXIT_SUCCESS */
+/* exit, EXIT_SUCCESS, malloc, free */
 #include <stdlib.h>
 /* NULL */
 #include <stddef.h>
 /* dlopen, dlsym, dlerror */
 #include <dlfcn.h>
-
-#define HASHTBLSIZE 65536
-
-typedef struct stack_item
+/* strcmp, strcpy, strlen, strcat, strdup */
+#include <string.h>
+/* getopt, STDIN_FILENO, STDOUT_FILENO */
+#include <unistd.h>
+/* EX_NOINPUT, EX_USAGE */
+#include <sysexits.h>
+/* mtrace, muntrace */
+#include <mcheck.h>
+
+#include "stack.h"
+
+/* Initialize a newly created environment */
+void init_env(environment *env)
 {
-  enum {
-    value,			/* Integer */
-    string, 
-    ref,	    /* Reference (to an element in the hash table) */ 
-    func,			/* Function pointer */
-    symbol, 
-    list
-  } type;			/* Tells what kind of stack element */
-  
-  union {
-    void* ptr;			/* Pointer to the content */
-    int val;			/* ...or an integer */
-  } content;			/* Stores a pointer or an integer */
+  int i;
 
-  char* id;			/* Symbol name */
-  struct stack_item* next;	/* Next element */
-} stackitem;
+  env->gc_limit= 20;
+  env->gc_count= 0;
 
+  env->head= NULL;
+  for(i= 0; i<HASHTBLSIZE; i++)
+    env->symbols[i]= NULL;
+  env->err= 0;
+  env->in_string= NULL;
+  env->free_string= NULL;
+  env->inputstream= stdin;
+  env->interactive= 1;
+}
 
-typedef stackitem* hashtbl[HASHTBLSIZE]; /* Hash table declaration */
-typedef void (*funcp)(stackitem**); /* Function pointer declaration */
-
+void printerr(const char* in_string) {
+  fprintf(stderr, "Err: %s\n", in_string);
+}
 
-/* Initiates a newly created hash table. */
-void init_hashtbl(hashtbl out_hash)
+/* Discard the top element of the stack. */
+extern void toss(environment *env)
 {
-  long i;
+  stackitem *temp= env->head;
 
-  for(i= 0; i<HASHTBLSIZE; i++)
-    out_hash[i]= NULL;
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  
+  env->head= env->head->next;	/* Remove the top stack item */
+  free(temp);			/* Free the old top stack item */
 }
 
-/* Returns a pointer to an element in the hash table. */
-stackitem** hash(hashtbl in_hashtbl, const char* in_string)
+/* 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;
-  char key= 0;
-  stackitem** position;
+  int i= 0;
+  unsigned int out_hash= 0;
+  char key= '\0';
+  symbol **position;
   
   while(1){			/* Hash in_string */
     key= in_string[i++];
@@ -61,126 +72,249 @@
   out_hash= out_hash%HASHTBLSIZE;
   position= &(in_hashtbl[out_hash]);
 
-  while(1){			/* Return position if empty */
-    if(*position==NULL)
+  while(1){
+    if(*position==NULL)		/* If empty */
       return position;
     
-    if(strcmp(in_string, (*position)->id)==0) /* Return position if match */
+    if(strcmp(in_string, (*position)->id)==0) /* If match */
       return position;
 
     position= &((*position)->next); /* Try next */
   }
 }
 
-/* Generic push function. */
-int push(stackitem** stack_head, stackitem* in_item)
-{
-  in_item->next= *stack_head;
-  *stack_head= in_item;
-  return 1;
-}
+value* new_val(environment *env) {
+  value *nval= malloc(sizeof(value));
+  stackitem *nitem= malloc(sizeof(stackitem));
 
-/* Push a value on the stack. */
-int push_val(stackitem** stack_head, int in_val) 
-{
-  stackitem* new_item= malloc(sizeof(stackitem));
-  new_item->content.val= in_val;
-  new_item->type= value;
+  nval->content.ptr= NULL;
 
-  push(stack_head, new_item);
-  return 1;
-}
+  nitem->item= nval;
+  nitem->next= env->gc_ref;
+  env->gc_ref= nitem;
 
-/* Copy a string onto the stack. */
-int push_cstring(stackitem** stack_head, const char* in_string)
-{
-  stackitem* new_item= malloc(sizeof(stackitem));
-  new_item->content.ptr= malloc(strlen(in_string)+1);
-  strcpy(new_item->content.ptr, in_string);
-  new_item->type= string;
+  env->gc_count++;
 
-  push(stack_head, new_item);
-  return 1;
+  return nval;
 }
 
-/* Create a new hash entry. */
-int mk_hashentry(hashtbl in_hashtbl, stackitem* in_item, const char* id)
-{
-  in_item->id= malloc(strlen(id)+1);
+void gc_mark(value *val) {
+  stackitem *iterator;
+
+  if(val==NULL || val->gc_garb==0)
+    return;
 
-  strcpy(in_item->id, id);
-  push(hash(in_hashtbl, id), in_item);
+  val->gc_garb= 0;
 
-  return 1;
+  if(val->type==list) {
+    iterator= val->content.ptr;
+
+    while(iterator!=NULL) {
+      gc_mark(iterator->item);
+      iterator= iterator->next;
+    }
+  }
 }
 
-/* Define a function a new function in the hash table. */
-void def_func(hashtbl in_hashtbl, funcp in_func, const char* id)
-{
-  stackitem* temp= malloc(sizeof(stackitem));
+extern void gc_init(environment *env) {
+  stackitem *new_head= NULL, *titem, *iterator= env->gc_ref;
+  symbol *tsymb;
+  int i;
+
+  if(env->gc_count < env->gc_limit)
+    return;
+
+  while(iterator!=NULL) {
+    iterator->item->gc_garb= 1;
+    iterator= iterator->next;
+  }
+
+  /* Mark */
+  iterator= env->head;
+  while(iterator!=NULL) {
+    gc_mark(iterator->item);
+    iterator= iterator->next;
+  }
 
-  temp->type= func;
-  temp->content.ptr= in_func;
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    tsymb= env->symbols[i];
+    while(tsymb!=NULL) {
+      gc_mark(tsymb->val);
+      tsymb= tsymb->next;
+    }
+  }
+
+  env->gc_count= 0;
+
+  /* Sweep */
+  while(env->gc_ref!=NULL) {
+    if(env->gc_ref->item->gc_garb) {
+      switch(env->gc_ref->item->type) {
+      case string:
+	free(env->gc_ref->item->content.ptr);
+	break;
+      case integer:
+	break;
+      case list:
+	while(env->gc_ref->item->content.ptr!=NULL) {
+	  titem= env->gc_ref->item->content.ptr;
+	  env->gc_ref->item->content.ptr= titem->next;
+	  free(titem);
+	}
+	break;
+      default:
+	break;
+      }
+      free(env->gc_ref->item);
+      titem= env->gc_ref->next;
+      free(env->gc_ref);
+      env->gc_ref= titem;
+    } else {
+      titem= env->gc_ref->next;
+      env->gc_ref->next= new_head;
+      new_head= env->gc_ref;
+      env->gc_ref= titem;
+      env->gc_count++;
+    }
+  }
 
-  mk_hashentry(in_hashtbl, temp, id);
+  env->gc_limit= env->gc_count*2;
+  env->gc_ref= new_head;
 }
 
-/* Define a new symbol in the hash table. */
-void def_sym(hashtbl in_hashtbl, const char* id)
+/* Push a value onto the stack */
+void push_val(environment *env, value *val)
 {
-  stackitem* temp= malloc(sizeof(stackitem));
-  
-  temp->type= symbol;
-  mk_hashentry(in_hashtbl, temp, id);
+  stackitem *new_item= malloc(sizeof(stackitem));
+  new_item->item= val;
+  new_item->next= env->head;
+  env->head= new_item;
 }
 
-/* Push a reference to an entry in the hash table onto the stack. */
-int push_ref(stackitem** stack_head, hashtbl in_hash, const char* in_string)
+/* Push an integer onto the stack. */
+void push_int(environment *env, int in_val) 
 {
-  static void* handle= NULL;
-  void* symbol;
+  value *new_value= new_val(env);
+  
+  new_value->content.val= in_val;
+  new_value->type= integer;
 
-  stackitem* new_item= malloc(sizeof(stackitem));
-  new_item->content.ptr= *hash(in_hash, in_string);
-  new_item->type= ref;
+  push_val(env, new_value);
+}
 
-  if(new_item->content.ptr==NULL) { /* If hash entry empty */
-    if(handle==NULL)		/* If no handle */
-      handle= dlopen(NULL, RTLD_LAZY);    
+/* Copy a string onto the stack. */
+void push_cstring(environment *env, const char *in_string)
+{
+  value *new_value= new_val(env);
 
-    symbol= dlsym(handle, in_string); /* Get function pointer */
-    if(dlerror()==NULL) 	/* If existing function pointer */
-      def_func(in_hash, symbol, in_string); /* Store function pointer */
-    else
-      def_sym(in_hash, in_string); /* Make symbol */
-      
-    new_item->content.ptr= *hash(in_hash, in_string); /* XXX */
-    new_item->type= ref;
+  new_value->content.ptr= malloc(strlen(in_string)+1);
+  strcpy(new_value->content.ptr, in_string);
+  new_value->type= string;
+
+  push_val(env, new_value);
+}
+
+/* Mangle a symbol name to a valid C identifier name */
+char *mangle_str(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[(unsigned char)(old_string[0])/16];
+    current[1]=validchars[(unsigned char)(old_string[0])%16];
+    current+=2;
+    old_string++;
   }
+  current[0]='\0';
 
-  push(stack_head, new_item);
-  return 1;
+  return new_string;		/* The caller must free() it */
 }
 
-void printerr(const char* in_string) {
-  fprintf(stderr, "Err: %s\n", in_string);
-}
+extern void mangle(environment *env){
+  char *new_string;
 
-/* Discard the top element of the stack. */
-extern void toss(stackitem** stack_head)
-{
-  stackitem* temp= *stack_head;
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
 
-  if((*stack_head)==NULL) {
-    printerr("Stack empty");
+  if(env->head->item->type!=string) {
+    printerr("Bad Argument Type");
+    env->err=2;
     return;
   }
-  
-  if((*stack_head)->type==string)
-    free((*stack_head)->content.ptr);
 
-  *stack_head= (*stack_head)->next;
-  free(temp);
+  new_string= mangle_str((const char *)(env->head->item->content.ptr));
+
+  toss(env);
+  if(env->err) return;
+
+  push_cstring(env, new_string);
+}
+
+/* Push a symbol onto the stack. */
+void push_sym(environment *env, const char *in_string)
+{
+  value *new_value;		/* A new symbol value */
+  /* ...which might point to... */
+  symbol **new_symbol;		/* (if needed) A new actual symbol */
+  /* ...which, if possible, will be bound to... */
+  value *new_fvalue;		/* (if needed) A new function value */
+  /* ...which will point to... */
+  void *funcptr;		/* A function pointer */
+
+  static void *handle= NULL;	/* Dynamic linker handle */
+  const char *dlerr;		/* Dynamic linker error */
+  char *mangled;		/* Mangled function name */
+
+  new_value= new_val(env);
+
+  /* The new value is a symbol */
+  new_value->type= symb;
+
+  /* Look up the symbol name in the hash table */
+  new_symbol= hash(env->symbols, in_string);
+  new_value->content.ptr= *new_symbol;
+
+  if(*new_symbol==NULL) { /* If symbol was undefined */
+
+    /* Create a new symbol */
+    (*new_symbol)= malloc(sizeof(symbol));
+    (*new_symbol)->val= NULL;	/* undefined value */
+    (*new_symbol)->next= NULL;
+    (*new_symbol)->id= malloc(strlen(in_string)+1);
+    strcpy((*new_symbol)->id, in_string);
+
+    /* Intern the new symbol in the hash table */
+    new_value->content.ptr= *new_symbol;
+
+    /* Try to load the symbol name as an external function, to see if
+       we should bind the symbol to a new function pointer value */
+    if(handle==NULL)		/* If no handle */
+      handle= dlopen(NULL, RTLD_LAZY);
+
+    mangled=mangle_str(in_string); /* mangle the name */
+    funcptr= dlsym(handle, mangled); /* and try to find it */
+    free(mangled);
+    dlerr=dlerror();
+    if(dlerr != NULL) {		/* If no function was found */
+      funcptr= dlsym(handle, in_string); /* Get function pointer */
+      dlerr=dlerror();
+    }
+    if(dlerr==NULL) {		/* If a function was found */
+      new_fvalue= new_val(env); /* Create a new value */
+      new_fvalue->type=func;	/* The new value is a function pointer */
+      new_fvalue->content.ptr=funcptr; /* Store function pointer */
+      (*new_symbol)->val= new_fvalue; /* Bind the symbol to the new
+                                         function value */
+    }
+  }
+  push_val(env, new_value);
 }
 
 /* Print newline. */
@@ -189,299 +323,1027 @@
   printf("\n");
 }
 
-/* Prints the top element of the stack. */
-void print_(stackitem** stack_head)
-{
-  if((*stack_head)==NULL) {
-    printerr("Stack empty");
+/* Gets the type of a value */
+extern void type(environment *env){
+  int typenum;
+
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
     return;
   }
+  typenum=env->head->item->type;
+  toss(env);
+  switch(typenum){
+  case integer:
+    push_sym(env, "integer");
+    break;
+  case string:
+    push_sym(env, "string");
+    break;
+  case symb:
+    push_sym(env, "symbol");
+    break;
+  case func:
+    push_sym(env, "function");
+    break;
+  case list:
+    push_sym(env, "list");
+    break;
+  }
+}    
 
-  switch((*stack_head)->type) {
-  case value:
-    printf("%d", (*stack_head)->content.val);
+/* Prints the top element of the stack. */
+void print_h(stackitem *stack_head, int noquote)
+{
+  switch(stack_head->item->type) {
+  case integer:
+    printf("%d", stack_head->item->content.val);
     break;
   case string:
-    printf("%s", (char*)(*stack_head)->content.ptr);
+    if(noquote)
+      printf("%s", (char*)stack_head->item->content.ptr);
+    else
+      printf("\"%s\"", (char*)stack_head->item->content.ptr);
     break;
-  case ref:
-    printf("%s", ((stackitem*)(*stack_head)->content.ptr)->id);
+  case symb:
+    printf("%s", ((symbol *)(stack_head->item->content.ptr))->id);
     break;
-  case symbol:
-  default:
-    printf("%p", (*stack_head)->content.ptr);
+  case func:
+    printf("#<function %p>", (funcp)(stack_head->item->content.ptr));
+    break;
+  case list:
+    /* A list is just a stack, so make stack_head point to it */
+    stack_head=(stackitem *)(stack_head->item->content.ptr);
+    printf("[ ");
+    while(stack_head != NULL) {
+      print_h(stack_head, noquote);
+      printf(" ");
+      stack_head=stack_head->next;
+    }
+    printf("]");
     break;
   }
 }
 
+extern void print_(environment *env) {
+  if(env->head==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  print_h(env->head, 0);
+  nl();
+}
+
+/* Prints the top element of the stack and then discards it. */
+extern void print(environment *env)
+{
+  print_(env);
+  if(env->err) return;
+  toss(env);
+}
+
+extern void princ_(environment *env) {
+  if(env->head==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  print_h(env->head, 1);
+}
+
 /* Prints the top element of the stack and then discards it. */
-extern void print(stackitem** stack_head)
+extern void princ(environment *env)
 {
-  print_(stack_head);
-  toss(stack_head);
+  princ_(env);
+  if(env->err) return;
+  toss(env);
 }
 
 /* Only to be called by function printstack. */
-void print_st(stackitem* stack_head, long counter)
+void print_st(stackitem *stack_head, long counter)
 { 
   if(stack_head->next != NULL)
     print_st(stack_head->next, counter+1);
-
   printf("%ld: ", counter);
-  print_(&stack_head);
+  print_h(stack_head, 0);
   nl();
 }
 
 /* Prints the stack. */
-extern void printstack(stackitem** stack_head)
+extern void printstack(environment *env)
 {
-  if(*stack_head != NULL) {
-    print_st(*stack_head, 1);
-    printf("\n");
-  } else {
-    printerr("Stack empty");
+  if(env->head == NULL) {
+    printf("Stack Empty\n");
+    return;
   }
+  print_st(env->head, 1);
 }
 
-/* If the top element is a reference, determine if it's a reference to a
-   function, and if it is, toss the reference and execute the function. */
-extern void eval(stackitem** stack_head)
+/* Swap the two top elements on the stack. */
+extern void swap(environment *env)
 {
-  funcp in_func;
+  stackitem *temp= env->head;
+  
+  if(env->head==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
 
-  if((*stack_head)==NULL || (*stack_head)->type!=ref) {
-    printerr("Stack empty or not a reference");
+  env->head= env->head->next;
+  temp->next= env->head->next;
+  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)
+{
+  value *val;
+
+  if(env->head == NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  if(env->head->item->type!=symb) {
+    printerr("Bad Argument Type");
+    env->err=2;
     return;
   }
 
-  if(((stackitem*)(*stack_head)->content.ptr)->type==func) {
-    in_func= (funcp)((stackitem*)(*stack_head)->content.ptr)->content.ptr;
-    toss(stack_head); 
-    (*in_func)(stack_head);
+  val=((symbol *)(env->head->item->content.ptr))->val;
+  if(val == NULL){
+    printerr("Unbound Variable");
+    env->err=3;
     return;
-  } else
-    printerr("Not a function");
+  }
+  toss(env);		/* toss the symbol */
+  if(env->err) return;
+  push_val(env, val); /* Return its bound value */
 }
 
-/* Parse input. */
-int stack_read(stackitem** stack_head, hashtbl in_hash, char* in_line) 
+/* 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)
 {
-  char *temp, *rest;
-  int itemp;
-  size_t inlength= strlen(in_line)+1;
-  int convert= 0;
+  funcp in_func;
+  value* temp_val;
+  stackitem* iterator;
 
-  temp= malloc(inlength);
-  rest= malloc(inlength);
+ eval_start:
 
-  do {
-    /* If string */
-    if((convert= sscanf(in_line, "\"%[^\"\n\r]\" %[^\n\r]", temp, rest))) {
-      push_cstring(stack_head, temp);
-      break;
-    }
-    /* If value */
-    if((convert= sscanf(in_line, "%d %[^\n\r]", &itemp, rest))) {
-      push_val(stack_head, itemp);
-      break;
-    }
-    /* Escape ';' with '\' */
-    if((convert= sscanf(in_line, "\\%c%[^\n\r]", temp, rest))) {
-      temp[1]= '\0'; 
-      push_ref(stack_head, in_hash, temp);
-      break;
-    } 
-    /* If symbol */
-    if((convert= sscanf(in_line, "%[^ ;\n\r]%[^\n\r]", temp, rest))) {
-	push_ref(stack_head, in_hash, temp);
-	break;
-    }
-    /* If ';' */
-    if((convert= sscanf(in_line, "%c%[^\n\r]", temp, rest)) && *temp==';') {
-      eval(stack_head);		/* Evaluate top element */
-      break;
-    }
-  } while(0);
+  if(env->head==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
 
+  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 */
+      goto eval_start;
+    }
+    return;
 
-  free(temp);
+    /* 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;
+    return in_func(env);
+
+    /* If it's a list */
+  case list:
+    temp_val= env->head->item;
+    toss(env);
+    if(env->err) return;
+    iterator= (stackitem*)temp_val->content.ptr;
+    while(iterator!=NULL) {
+      push_val(env, 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){
+	  goto eval_start;
+	}
+	eval(env);
+	if(env->err) return;
+      }
+      iterator= iterator->next;
+    }
+    return;
 
-  if(convert<2) {
-    free(rest);
-    return 0;
+  default:
+    return;
   }
-   
-  stack_read(stack_head, in_hash, rest);
-  
-  free(rest);
-  return 1;
 }
 
-/* Make a list. */
-extern void pack(stackitem** stack_head)
-{
-  void* delimiter;
-  stackitem *iterator, *temp, *pack;
+/* Reverse (flip) a list */
+extern void rev(environment *env){
+  stackitem *old_head, *new_head, *item;
+
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
 
-  if((*stack_head)==NULL) {
-    printerr("Stack empty");
+  if(env->head->item->type!=list) {
+    printerr("Bad Argument Type");
+    env->err=2;
     return;
   }
 
-  delimiter= (*stack_head)->content.ptr; /* Get delimiter */
-  toss(stack_head);
+  old_head=(stackitem *)(env->head->item->content.ptr);
+  new_head=NULL;
+  while(old_head != NULL){
+    item=old_head;
+    old_head=old_head->next;
+    item->next=new_head;
+    new_head=item;
+  }
+  env->head->item->content.ptr=new_head;
+}
 
-  iterator= *stack_head;
+/* Make a list. */
+extern void pack(environment *env)
+{
+  stackitem *iterator, *temp;
+  value *pack;
 
-  /* Search for first delimiter */
-  while(iterator->next!=NULL && iterator->next->content.ptr!=delimiter)
-    iterator= iterator->next;
+  iterator= env->head;
 
-  /* Extract list */
-  temp= *stack_head;
-  *stack_head= iterator->next;
-  iterator->next= NULL;
-  
-  if(*stack_head!=NULL && (*stack_head)->content.ptr==delimiter)
-    toss(stack_head);
+  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->type!=symb
+	  || ((symbol*)(iterator->next->item->content.ptr))->id[0]!='['))
+      iterator= iterator->next;
+    
+    /* Extract list */
+    temp= env->head;
+    env->head= iterator->next;
+    iterator->next= NULL;
+    
+    if(env->head!=NULL)
+      toss(env);
+  }
 
   /* Push list */
-  pack= malloc(sizeof(stackitem));
+  pack= new_val(env);
   pack->type= list;
   pack->content.ptr= temp;
 
-  push(stack_head, pack);
+  push_val(env, pack);
+  rev(env);
 }
 
 /* Relocate elements of the list on the stack. */
-extern void expand(stackitem** stack_head)
+extern void expand(environment *env)
 {
   stackitem *temp, *new_head;
 
   /* Is top element a list? */
-  if((*stack_head)==NULL || (*stack_head)->type!=list) {
-    printerr("Stack empty or not a list");
+  if(env->head==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
     return;
   }
+  if(env->head->item->type!=list) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
+  rev(env);
+
+  if(env->err)
+    return;
 
   /* The first list element is the new stack head */
-  new_head= temp= (*stack_head)->content.ptr;
-  toss(stack_head);
+  new_head= temp= env->head->item->content.ptr;
+
+  toss(env);
 
-  /* Search the end of the list */
+  /* Find the end of the list */
   while(temp->next!=NULL)
     temp= temp->next;
 
-  /* Connect the the tail of the list with the old stack head */
-  temp->next= *stack_head;
-  *stack_head= new_head;	/* ...and voila! */
-}
+  /* Connect the tail of the list with the old stack head */
+  temp->next= env->head;
+  env->head= new_head;		/* ...and voila! */
 
-/* Swap the two top elements on the stack. */
-extern void swap(stackitem** stack_head)
-{
-  stackitem* temp= (*stack_head);
-  
-  if((*stack_head)==NULL) {
-    printerr("Stack empty");
-    return;
-  }
-
-  if((*stack_head)->next==NULL)
-    return;
-
-  *stack_head= (*stack_head)->next;
-  temp->next= (*stack_head)->next;
-  (*stack_head)->next= temp;
-} 
+}
 
 /* Compares two elements by reference. */
-extern void eq(stackitem** stack_head)
+extern void eq(environment *env)
 {
   void *left, *right;
   int result;
 
-  if((*stack_head)==NULL || (*stack_head)->next==NULL) {
-    printerr("Not enough elements to compare");
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
     return;
   }
 
-  left= (*stack_head)->content.ptr;
-  swap(stack_head);
-  right= (*stack_head)->content.ptr;
+  left= env->head->item->content.ptr;
+  swap(env);
+  right= env->head->item->content.ptr;
   result= (left==right);
   
-  toss(stack_head); toss(stack_head);
-  push_val(stack_head, (left==right));
+  toss(env); toss(env);
+  push_int(env, result);
 }
 
 /* Negates the top element on the stack. */
-extern void not(stackitem** stack_head)
+extern void not(environment *env)
 {
-  int value;
+  int val;
 
-  if((*stack_head)==NULL || (*stack_head)->type!=value) {
-    printerr("Stack empty or element is not a value");
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
     return;
   }
 
-  value= (*stack_head)->content.val;
-  toss(stack_head);
-  push_val(stack_head, !value);
+  if(env->head->item->type!=integer) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
+  val= env->head->item->content.val;
+  toss(env);
+  push_int(env, !val);
 }
 
 /* Compares the two top elements on the stack and return 0 if they're the
    same. */
-extern void neq(stackitem** stack_head)
+extern void neq(environment *env)
 {
-  eq(stack_head);
-  not(stack_head);
+  eq(env);
+  not(env);
 }
 
 /* Give a symbol some content. */
-extern void def(stackitem** stack_head)
+extern void def(environment *env)
 {
-  stackitem *temp, *value;
+  symbol *sym;
+
+  /* Needs two values on the stack, the top one must be a symbol */
+  if(env->head==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
 
-  if(*stack_head==NULL || (*stack_head)->next==NULL 
-     || (*stack_head)->type!=ref) {
-    printerr("Define what?");
+  if(env->head->item->type!=symb) {
+    printerr("Bad Argument Type");
+    env->err=2;
     return;
   }
 
-  temp= (*stack_head)->content.ptr;
-  value= (*stack_head)->next;
-  temp->content= value->content;
-  value->content.ptr=NULL;
-  temp->type= value->type;
+  /* long names are a pain */
+  sym=env->head->item->content.ptr;
 
-  toss(stack_head); toss(stack_head);
+  /* if the symbol was bound to something else, throw it away */
+
+  /* Bind the symbol to the value */
+  sym->val= env->head->next->item;
+
+  toss(env); toss(env);
 } 
 
 /* Quit stack. */
-extern void quit()
+extern void quit(environment *env)
 {
+  long i;
+
+  clear(env);
+
+  if (env->err) return;
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    while(env->symbols[i]!= NULL) {
+      forget_sym(&(env->symbols[i]));
+    }
+    env->symbols[i]= NULL;
+  }
+
+  gc_init(env);
+
+  if(env->free_string!=NULL)
+    free(env->free_string);
+  
+  muntrace();
+
   exit(EXIT_SUCCESS);
 }
 
-int main()
+/* Clear stack */
+extern void clear(environment *env)
+{
+  while(env->head!=NULL)
+    toss(env);
+}
+
+/* List all defined words */
+extern void words(environment *env)
 {
-  stackitem* s= NULL;
-  hashtbl myhash;
-  char in_string[100];
+  symbol *temp;
+  int i;
+  
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    temp= env->symbols[i];
+    while(temp!=NULL) {
+      printf("%s\n", temp->id);
+      temp= temp->next;
+    }
+  }
+}
 
-  init_hashtbl(myhash);
+/* Internal forget function */
+void forget_sym(symbol **hash_entry) {
+  symbol *temp;
 
-  printf("okidok\n ");
+  temp= *hash_entry;
+  *hash_entry= (*hash_entry)->next;
+  
+  free(temp->id);
+  free(temp);
+}
 
-  while(fgets(in_string, 100, stdin) != NULL) {
-    stack_read(&s, myhash, in_string);
-    printf("okidok\n ");
+/* Forgets a symbol (remove it from the hash table) */
+extern void forget(environment *env)
+{
+  char* sym_id;
+  stackitem *stack_head= env->head;
+
+  if(stack_head==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  
+  if(stack_head->item->type!=symb) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
   }
 
-  exit(EXIT_SUCCESS);
+  sym_id= ((symbol*)(stack_head->item->content.ptr))->id;
+  toss(env);
+
+  return forget_sym(hash(env->symbols, sym_id));
+}
+
+/* Returns the current error number to the stack */
+extern void errn(environment *env){
+  push_int(env, env->err);
+}
+
+int main(int argc, char **argv)
+{
+  environment myenv;
+
+  int c;			/* getopt option character */
+
+  mtrace();
+
+  init_env(&myenv);
+
+  myenv.interactive = isatty(STDIN_FILENO) && isatty(STDOUT_FILENO);
+
+  while ((c = getopt (argc, argv, "i")) != -1)
+    switch (c)
+      {
+      case 'i':
+	myenv.interactive = 1;
+	break;
+      case '?':
+	fprintf (stderr,
+		 "Unknown option character `\\x%x'.\n",
+		 optopt);
+	return EX_USAGE;
+      default:
+	abort ();
+      }
+  
+  if (optind < argc) {
+    myenv.interactive = 0;
+    myenv.inputstream= fopen(argv[optind], "r");
+    if(myenv.inputstream== NULL) {
+      perror(argv[0]);
+      exit (EX_NOINPUT);
+    }
+  }
+
+  while(1) {
+    if(myenv.in_string==NULL) {
+      if (myenv.interactive) {
+	if(myenv.err) {
+	  printf("(error %d)\n", myenv.err);
+	}
+	nl();
+	printstack(&myenv);
+	printf("> ");
+      }
+      myenv.err=0;
+    }
+    sx_72656164(&myenv);
+    if (myenv.err==4) {
+      return EX_NOINPUT;
+    } else if(myenv.head!=NULL
+	      && myenv.head->item->type==symb
+	      && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
+      toss(&myenv); 		/* No error check in main */
+      eval(&myenv);
+    }
+    gc_init(&myenv);
+  }
+  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;
+    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);
+    push_cstring(env, 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, a+b);
+}
+
+/* "-" */
+extern void sx_2d(environment *env) {
+  int a, b;
+
+  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;
+  b=env->head->item->content.val;
+  toss(env); if(env->err) return;
+  push_int(env, b-a);
+}
+
+/* ">" */
+extern void sx_3e(environment *env) {
+  int a, b;
+
+  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;
+  b=env->head->item->content.val;
+  toss(env); if(env->err) return;
+  push_int(env, b>a);
+}
+
+/* Return copy of a value */
+value *copy_val(environment *env, value *old_value){
+  stackitem *old_item, *new_item, *prev_item;
+
+  value *new_value=new_val(env);
+
+  new_value->type=old_value->type;
+
+  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(env, 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;
+}
+
+/* "dup"; duplicates an item on the stack */
+extern void sx_647570(environment *env) {
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+  push_val(env, copy_val(env, 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;
+  value *loop, *test;
+
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  loop= env->head->item;
+  toss(env); if(env->err) return;
+
+  test= env->head->item;
+  toss(env); if(env->err) return;
+
+  do {
+    push_val(env, test);
+    eval(env);
+    
+    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;
+    
+    if(truth) {
+      push_val(env, loop);
+      eval(env);
+    } else {
+      toss(env);
+    }
+  
+  } while(truth);
+}
+
+
+/* "for"; for-loop */
+extern void sx_666f72(environment *env) {
+  value *loop;
+  int foo1, foo2;
+
+  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->item->type!=integer
+     || env->head->next->next->item->type!=integer) {
+    printerr("Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  loop= env->head->item;
+  toss(env); if(env->err) return;
+
+  foo2= env->head->item->content.val;
+  toss(env); if(env->err) return;
+
+  foo1= env->head->item->content.val;
+  toss(env); if(env->err) return;
+
+  if(foo1<=foo2) {
+    while(foo1<=foo2) {
+      push_int(env, foo1);
+      push_val(env, loop);
+      eval(env); if(env->err) return;
+      foo1++;
+    }
+  } else {
+    while(foo1>=foo2) {
+      push_int(env, foo1);
+      push_val(env, loop);
+      eval(env); if(env->err) return;
+      foo1--;
+    }
+  }
+}
+
+/* Variant of for-loop */
+extern void foreach(environment *env) {
+  
+  value *loop, *foo;
+  stackitem *iterator;
+  
+  if((env->head)==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
+    env->err=1;
+    return;
+  }
+
+  if(env->head->next->item->type != list) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
+  loop= env->head->item;
+  toss(env); if(env->err) return;
+
+  foo= env->head->item;
+  toss(env); if(env->err) return;
+
+  iterator= foo->content.ptr;
+
+  while(iterator!=NULL) {
+    push_val(env, iterator->item);
+    push_val(env, loop);
+    eval(env); if(env->err) return;
+    iterator= iterator->next;
+  }
 }
 
-/* Local Variables: */
-/* compile-command:"make CFLAGS=\"-Wall -g -rdynamic -ldl\" stack" */
-/* End: */
+/* "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");
+    env->err=1;
+    return;
+  }
+
+  if(env->head->item->type!=integer 
+     || env->head->next->item->type!=integer) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
+  ending= env->head->item->content.val;
+  toss(env); if(env->err) return;
+  start= env->head->item->content.val;
+  toss(env); if(env->err) return;
+
+  temp_head= env->head;
+  env->head= NULL;
+
+  if(ending>=start) {
+    for(i= ending; i>=start; i--)
+      push_int(env, i);
+  } else {
+    for(i= ending; i<=start; i++)
+      push_int(env, i);
+  }
+
+  temp_val= new_val(env);
+  temp_val->content.ptr= env->head;
+  temp_val->type= list;
+  env->head= temp_head;
+  push_val(env, temp_val);
+}
+
+/* Read a string */
+extern void readline(environment *env) {
+  char in_string[101];
+
+  if(fgets(in_string, 100, env->inputstream)==NULL)
+    push_cstring(env, "");
+  else
+    push_cstring(env, in_string);
+}
+
+/* "read"; Read a value and place on stack */
+extern void sx_72656164(environment *env) {
+  const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%n";
+  const char strform[]= "\"%[^\"]\"%n";
+  const char intform[]= "%i%n";
+  const char blankform[]= "%*[ \t]%n";
+  const char ebrackform[]= "%*1[]]%n";
+  const char semicform[]= "%*1[;]%n";
+  const char bbrackform[]= "%*1[[]%n";
+
+  int itemp, readlength= -1;
+  static int depth= 0;
+  char *match;
+  size_t inlength;
+
+  if(env->in_string==NULL) {
+    if(depth > 0 && env->interactive) {
+      printf("]> ");
+    }
+    readline(env); if(env->err) return;
+
+    if(((char *)(env->head->item->content.ptr))[0]=='\0'){
+      env->err= 4;		/* "" means EOF */
+      return;
+    }
+    
+    env->in_string= malloc(strlen(env->head->item->content.ptr)+1);
+    env->free_string= env->in_string; /* Save the original pointer */
+    strcpy(env->in_string, env->head->item->content.ptr);
+    toss(env); if(env->err) return;
+  }
+  
+  inlength= strlen(env->in_string)+1;
+  match= malloc(inlength);
+
+  if(sscanf(env->in_string, blankform, &readlength)!=EOF
+     && readlength != -1) {
+    ; 
+  } else if(sscanf(env->in_string, intform, &itemp, &readlength) != EOF
+	    && readlength != -1) {
+    push_int(env, itemp);
+  } else if(sscanf(env->in_string, strform, match, &readlength) != EOF
+	    && readlength != -1) {
+    push_cstring(env, match);
+  } else if(sscanf(env->in_string, symbform, match, &readlength) != EOF
+	    && readlength != -1) {
+    push_sym(env, match);
+  } else if(sscanf(env->in_string, ebrackform, &readlength) != EOF
+	    && readlength != -1) {
+    pack(env); if(env->err) return;
+    if(depth != 0) depth--;
+  } else if(sscanf(env->in_string, semicform, &readlength) != EOF
+	    && readlength != -1) {
+    push_sym(env, ";");
+  } else if(sscanf(env->in_string, bbrackform, &readlength) != EOF
+	    && readlength != -1) {
+    push_sym(env, "[");
+    depth++;
+  } else {
+    free(env->free_string);
+    env->in_string = env->free_string = NULL;
+  }
+  if ( env->in_string != NULL) {
+    env->in_string += readlength;
+  }
+
+  free(match);
+
+  if(depth)
+    return sx_72656164(env);
+}