--- stack/stack.c	2002/03/31 02:19:54	1.125
+++ stack/stack.c	2003/08/04 11:22:02	1.126
@@ -21,35 +21,6 @@
 	     Teddy Hogeborn <teddy@fukt.bth.se>
 */
 
-#define CAR(X) ((X)->content.c->car)
-#define CDR(X) ((X)->content.c->cdr)
-
-/* printf, sscanf, fgets, fprintf, fopen, perror */
-#include <stdio.h>
-/* exit, EXIT_SUCCESS, malloc, free */
-#include <stdlib.h>
-/* NULL */
-#include <stddef.h>
-/* dlopen, dlsym, dlerror */
-#include <dlfcn.h>
-/* strcmp, strcpy, strlen, strcat, strdup */
-#include <string.h>
-/* getopt, STDIN_FILENO, STDOUT_FILENO, usleep */
-#include <unistd.h>
-/* EX_NOINPUT, EX_USAGE */
-#include <sysexits.h>
-/* assert */
-#include <assert.h>
-
-#ifdef __linux__
-/* mtrace, muntrace */
-#include <mcheck.h>
-/* ioctl */
-#include <sys/ioctl.h>
-/* KDMKTONE */
-#include <linux/kd.h>
-#endif /* __linux__ */
-
 #include "stack.h"
 
 /* Initialize a newly created environment */
@@ -76,18 +47,6 @@
   fprintf(stderr, "Err: %s\n", in_string);
 }
 
-/* Discard the top element of the stack. */
-extern void toss(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  env->head= CDR(env->head); /* Remove the 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)
 {
@@ -141,6 +100,7 @@
   return nval;
 }
 
+
 /* Mark values recursively. 
    Marked values are not collected by the GC. */
 inline void gc_mark(value *val)
@@ -156,13 +116,6 @@
   }
 }
 
-inline void gc_maybe(environment *env)
-{
-  if(env->gc_count < env->gc_limit)
-    return;
-  else
-    return gc_init(env);
-}
 
 /* Start GC */
 extern void gc_init(environment *env)
@@ -212,6 +165,7 @@
       case func:
       case symb:
 	/* Symbol strings are freed when walking the hash table */
+	break;
       }
 
       free(env->gc_ref->item);	/* Remove from gc_ref */
@@ -268,6 +222,14 @@
 
 }
 
+inline void gc_maybe(environment *env)
+{
+  if(env->gc_count < env->gc_limit)
+    return;
+  else
+    return gc_init(env);
+}
+
 /* Protect values from GC */
 void protect(value *val)
 {
@@ -462,75 +424,6 @@
   unprotect(new_value); unprotect(new_fvalue);
 }
 
-/* Print newline. */
-extern void nl(environment *env)
-{
-  printf("\n");
-}
-
-/* Print a newline to a port */
-extern void nlport(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  if(fprintf(CAR(env->head)->content.p, "\n") < 0){
-    perror("nl");
-    env->err= 5;
-    return;
-  }
-  toss(env);
-}
-
-/* Gets the type of a value */
-extern void type(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  switch(CAR(env->head)->type){
-  case empty:
-    push_sym(env, "empty");
-    break;
-  case integer:
-    push_sym(env, "integer");
-    break;
-  case tfloat:
-    push_sym(env, "float");
-    break;
-  case string:
-    push_sym(env, "string");
-    break;
-  case symb:
-    push_sym(env, "symbol");
-    break;
-  case func:
-    push_sym(env, "function");
-    break;
-  case tcons:
-    push_sym(env, "pair");
-    break;
-  case port:
-    push_sym(env, "port");
-    break;
-  }
-  swap(env);
-  if (env->err) return;
-  toss(env);
-}
-
 /* Print a value */
 void print_val(environment *env, value *val, int noquote, stackitem *stack, FILE *stream)
 {
@@ -682,123 +575,6 @@
   }
 }
 
-/* Print the top element of the stack but don't discard it */
-extern void print_(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  print_val(env, CAR(env->head), 0, NULL, stdout);
-  if(env->err) return;
-  nl(env);
-}
-
-/* Prints the top element of the stack */
-extern void print(environment *env)
-{
-  print_(env);
-  if(env->err) return;
-  toss(env);
-}
-
-/* Print the top element of the stack without quotes, but don't
-   discard it. */
-extern void princ_(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  print_val(env, CAR(env->head), 1, NULL, stdout);
-}
-
-/* Prints the top element of the stack without quotes. */
-extern void princ(environment *env)
-{
-  princ_(env);
-  if(env->err) return;
-  toss(env);
-}
-
-/* Print a value to a port, but don't discard it */
-extern void printport_(environment *env)
-{
-  if(env->head->type==empty ||  CDR(env->head)->type == empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  print_val(env, CAR(CDR(env->head)), 0, NULL, CAR(env->head)->content.p);
-  if(env->err) return;
-  nlport(env);
-}
-
-/* Print a value to a port */
-extern void printport(environment *env)
-{
-  printport_(env);
-  if(env->err) return;
-  toss(env);
-}
-
-/* Print, without quotes, to a port, a value, but don't discard it. */
-extern void princport_(environment *env)
-{
-  if(env->head->type==empty ||  CDR(env->head)->type == empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  print_val(env, CAR(CDR(env->head)), 1, NULL, CAR(env->head)->content.p);
-  toss(env); if(env->err) return;
-}
-
-/* Print, without quotes, to a port, the top element. */
-extern void princport(environment *env)
-{
-  princport_(env);
-  if(env->err) return;
-  toss(env);
-}
-
-/* Only to be called by itself function printstack. */
-void print_st(environment *env, value *stack_head, long counter)
-{ 
-  if(CDR(stack_head)->type != empty)
-    print_st(env, CDR(stack_head), counter+1);
-  printf("%ld: ", counter);
-  print_val(env, CAR(stack_head), 0, NULL, stdout);
-  nl(env);
-}
-
-/* Prints the stack. */
-extern void printstack(environment *env)
-{
-  if(env->head->type == empty) {
-    printf("Stack Empty\n");
-    return;
-  }
-
-  print_st(env, env->head, 1);
-}
-
 /* Swap the two top elements on the stack. */
 extern void swap(environment *env)
 {
@@ -815,23 +591,6 @@
   CDR(env->head)= temp;
 } 
 
-/* Rotate the first three elements on the stack. */
-extern void rot(environment *env)
-{
-  value *temp= env->head;
-  
-  if(env->head->type == empty || CDR(env->head)->type == empty
-     || CDR(CDR(env->head))->type == empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  env->head= CDR(CDR(env->head));
-  CDR(CDR(temp))= CDR(env->head);
-  CDR(env->head)= temp;
-}
-
 /* Recall a value from a symbol, if bound */
 extern void rcl(environment *env)
 {
@@ -862,6 +621,7 @@
   if(env->err) return;
 }
 
+
 /* 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. */
@@ -941,198 +701,32 @@
   }
 }
 
-/* Reverse (flip) a list */
-extern void rev(environment *env)
-{
-  value *old_head, *new_head, *item;
-
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type==empty)
-    return;			/* Don't reverse an empty list */
-
-  if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  old_head= CAR(env->head);
-  new_head= new_val(env);
-  while(old_head->type != empty) {
-    item= old_head;
-    old_head= CDR(old_head);
-    CDR(item)= new_head;
-    new_head= item;
-  }
-  CAR(env->head)= new_head;
-}
-
-/* Make a list. */
-extern void pack(environment *env)
-{
-  value *iterator, *temp, *ending;
-
-  ending=new_val(env);
-
-  iterator= env->head;
-  if(iterator->type == empty
-     || (CAR(iterator)->type==symb
-     && CAR(iterator)->content.sym->id[0]=='[')) {
-    temp= ending;
-    toss(env);
-  } else {
-    /* Search for first delimiter */
-    while(CDR(iterator)->type != empty
-	  && (CAR(CDR(iterator))->type!=symb
-	   || CAR(CDR(iterator))->content.sym->id[0]!='['))
-      iterator= CDR(iterator);
-    
-    /* Extract list */
-    temp= env->head;
-    env->head= CDR(iterator);
-    CDR(iterator)= ending;
-
-    if(env->head->type != empty)
-      toss(env);
-  }
-
-  /* Push list */
-
-  push_val(env, temp);
-  rev(env);
-}
-
-/* Relocate elements of the list on the stack. */
-extern void expand(environment *env)
+/* List all defined words */
+extern void words(environment *env)
 {
-  value *temp, *new_head;
-
-  /* Is top element a list? */
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=tcons) {
-    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= CAR(env->head);
-
-  toss(env);
-
-  /* Find the end of the list */
-  while(CDR(temp)->type != empty) {
-    if (CDR(temp)->type == tcons)
-      temp= CDR(temp);
-    else {
-      printerr("Bad Argument Type"); /* Improper list */
-      env->err= 2;
-      return;
+  symbol *temp;
+  int i;
+  
+  for(i= 0; i<HASHTBLSIZE; i++) {
+    temp= env->symbols[i];
+    while(temp!=NULL) {
+#ifdef DEBUG
+      if (temp->val != NULL && temp->val->gc.flag.protect)
+	printf("(protected) ");
+#endif /* DEBUG */
+      printf("%s ", temp->id);
+      temp= temp->next;
     }
   }
-
-  /* Connect the tail of the list with the old stack head */
-  CDR(temp)= env->head;
-  env->head= new_head;		/* ...and voila! */
-
 }
 
-/* Compares two elements by reference. */
-extern void eq(environment *env)
-{
-  void *left, *right;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  left= CAR(env->head)->content.ptr;
-  right= CAR(CDR(env->head))->content.ptr;
-  toss(env); toss(env);
-
-  push_int(env, left==right);
-}
-
-/* Negates the top element on the stack. */
-extern void not(environment *env)
-{
-  int val;
-
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  val= CAR(env->head)->content.i;
-  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(environment *env)
-{
-  eq(env);
-  not(env);
-}
-
-/* Give a symbol some content. */
-extern void def(environment *env)
-{
-  symbol *sym;
-
-  /* Needs two values on the stack, the top one must be a symbol */
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=symb) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  /* long names are a pain */
-  sym= CAR(env->head)->content.ptr;
-
-  /* Bind the symbol to the value */
-  sym->val= CAR(CDR(env->head));
-
-  toss(env); toss(env);
-} 
-
 /* Quit stack. */
 extern void quit(environment *env)
 {
   int i;
 
-  clear(env);
+  while(env->head->type != empty)
+    toss(env);
 
   if (env->err) return;
   for(i= 0; i<HASHTBLSIZE; i++) {
@@ -1157,32 +751,6 @@
   exit(EXIT_SUCCESS);
 }
 
-/* Clear stack */
-extern void clear(environment *env)
-{
-  while(env->head->type != empty)
-    toss(env);
-}
-
-/* List all defined words */
-extern void words(environment *env)
-{
-  symbol *temp;
-  int i;
-  
-  for(i= 0; i<HASHTBLSIZE; i++) {
-    temp= env->symbols[i];
-    while(temp!=NULL) {
-#ifdef DEBUG
-      if (temp->val != NULL && temp->val->gc.flag.protect)
-	printf("(protected) ");
-#endif /* DEBUG */
-      printf("%s\n", temp->id);
-      temp= temp->next;
-    }
-  }
-}
-
 /* Internal forget function */
 void forget_sym(symbol **hash_entry)
 {
@@ -1195,33 +763,25 @@
   free(temp);
 }
 
-/* Forgets a symbol (remove it from the hash table) */
-extern void forget(environment *env)
-{
-  char* sym_id;
+/* Only to be called by itself function printstack. */
+void print_st(environment *env, value *stack_head, long counter)
+{ 
+  if(CDR(stack_head)->type != empty)
+    print_st(env, CDR(stack_head), counter+1);
+  printf("%ld: ", counter);
+  print_val(env, CAR(stack_head), 0, NULL, stdout);
+  printf("\n");
+}
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  if(CAR(env->head)->type!=symb) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+/* Prints the stack. */
+extern void printstack(environment *env)
+{
+  if(env->head->type == empty) {
+    printf("Stack Empty\n");
     return;
   }
 
-  sym_id= CAR(env->head)->content.sym->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);
+  print_st(env, env->head, 1);
 }
 
 int main(int argc, char **argv)
@@ -1263,7 +823,7 @@
   }
 
   if(myenv.interactive) {
-    printf("Stack version $Revision: 1.125 $\n\
+    printf("Stack version $Revision: 1.126 $\n\
 Copyright (C) 2002  Mats Alritzson and Teddy Hogeborn\n\
 Stack comes with ABSOLUTELY NO WARRANTY; for details type 'warranty;'.\n\
 This is free software, and you are welcome to redistribute it\n\
@@ -1277,13 +837,13 @@
 	  printf("(error %d)\n", myenv.err);
 	  myenv.err= 0;
 	}
-	nl(&myenv);
+	printf("\n");
 	printstack(&myenv);
 	printf("> ");
       }
       myenv.err=0;
     }
-    sx_72656164(&myenv);	/* "read" */
+    readstream(&myenv, myenv.inputstream);
     if (myenv.err) {		/* EOF or other error */
       myenv.err=0;
       quit(&myenv);
@@ -1300,229 +860,6 @@
   return EXIT_FAILURE;
 }
 
-/* "+" */
-extern void sx_2b(environment *env)
-{
-  int a, b;
-  float fa, fb;
-  size_t len;
-  char* new_string;
-  value *a_val, *b_val;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type==string
-     && CAR(CDR(env->head))->type==string) {
-    a_val= CAR(env->head);
-    b_val= CAR(CDR(env->head));
-    protect(a_val); protect(b_val);
-    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);
-    assert(new_string != NULL);
-    strcpy(new_string, b_val->content.ptr);
-    strcat(new_string, a_val->content.ptr);
-    push_cstring(env, new_string);
-    unprotect(a_val); unprotect(b_val);
-    free(new_string);
-    
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b+a);
-
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb+fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_float(env, b+fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb+a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err=2;
-}
-
-/* "-" */
-extern void sx_2d(environment *env)
-{
-  int a, b;
-  float fa, fb;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err=1;
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b-a);
-
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb-fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_float(env, b-fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb-a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err=2;
-}
-
-/* ">" */
-extern void sx_3e(environment *env)
-{
-  int a, b;
-  float fa, fb;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b>a);
-
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_int(env, fb>fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b>fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_int(env, fb>a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err= 2;
-}
-
-/* "<" */
-extern void sx_3c(environment *env) 
-{
-  swap(env); if(env->err) return;
-  sx_3e(env);
-}
-
-/* "<=" */
-extern void sx_3c3d(environment *env)
-{
-  sx_3e(env); if(env->err) return;
-  not(env);
-}
-
-/* ">=" */
-extern void sx_3e3d(environment *env)
-{
-  sx_3c(env); if(env->err) return;
-  not(env);
-}
-
 /* Return copy of a value */
 value *copy_val(environment *env, value *old_value)
 {
@@ -1561,402 +898,86 @@
   return new_value;
 }
 
-/* "dup"; duplicates an item on the stack */
-extern void sx_647570(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  push_val(env, copy_val(env, CAR(env->head)));
-}
-
-/* "if", If-Then */
-extern void sx_6966(environment *env)
-{
-  int truth;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(CDR(env->head))->type != integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-  
-  swap(env);
-  if(env->err) return;
-  
-  truth= CAR(env->head)->content.i;
-
-  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->type==empty || CDR(env->head)->type==empty
-     || CDR(CDR(env->head))->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(CDR(CDR(env->head)))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-  
-  rot(env);
-  if(env->err) return;
-  
-  truth= CAR(env->head)->content.i;
-
-  toss(env);
-  if(env->err) return;
-
-  if(!truth)
-    swap(env);
-  if(env->err) return;
-
-  toss(env);
-  if(env->err) return;
-
-  eval(env);
-}
-
-/* "else" */
-extern void sx_656c7365(environment *env)
-{
-  if(env->head->type==empty || CDR(env->head)->type==empty 
-     || CDR(CDR(env->head))->type==empty || CDR(CDR(CDR(env->head)))->type==empty
-     || CDR(CDR(CDR(CDR(env->head))))->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(CDR(env->head))->type!=symb
-     || strcmp(CAR(CDR(env->head))->content.sym->id, "then")!=0
-     || CAR(CDR(CDR(CDR(env->head))))->type!=symb
-     || strcmp(CAR(CDR(CDR(CDR(env->head))))->content.sym->id, "if")!=0) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  swap(env); toss(env); rot(env); toss(env);
-  ifelse(env);
-}
-
-extern void then(environment *env)
-{
-  if(env->head->type==empty || CDR(env->head)->type==empty
-     || CDR(CDR(env->head))->type==empty) { 
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(CDR(env->head))->type!=symb
-     || strcmp(CAR(CDR(env->head))->content.sym->id, "if")!=0) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  swap(env); toss(env);
-  sx_6966(env);
-}
-
-/* "while" */
-extern void sx_7768696c65(environment *env)
+/* read a line from a stream; used by readline */
+void readlinestream(environment *env, FILE *stream)
 {
-  int truth;
-  value *loop, *test;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  loop= CAR(env->head);
-  protect(loop);
-  toss(env); if(env->err) return;
-
-  test= CAR(env->head);
-  protect(test);
-  toss(env); if(env->err) return;
+  char in_string[101];
 
-  do {
-    push_val(env, test);
-    eval(env);
-    
-    if(CAR(env->head)->type != integer) {
-      printerr("Bad Argument Type");
-      env->err= 2;
-      return;
-    }
-    
-    truth= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    
-    if(truth) {
-      push_val(env, loop);
-      eval(env);
-    } else {
-      toss(env);
+  if(fgets(in_string, 100, stream)==NULL) {
+    push_cstring(env, "");
+    if (! feof(stream)){
+      perror("readline");
+      env->err= 5;
     }
-  
-  } while(truth);
-
-  unprotect(loop); unprotect(test);
+  } else {
+    push_cstring(env, in_string);
+  }
 }
 
-
-/* "for"; for-loop */
-extern void sx_666f72(environment *env)
+/* Reverse (flip) a list */
+extern void rev(environment *env)
 {
-  value *loop;
-  int foo1, foo2;
+  value *old_head, *new_head, *item;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty 
-     || CDR(CDR(env->head))->type==empty) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
     env->err= 1;
     return;
   }
 
-  if(CAR(CDR(env->head))->type!=integer
-     || CAR(CDR(CDR(env->head)))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  loop= CAR(env->head);
-  protect(loop);
-  toss(env); if(env->err) return;
-
-  foo2= CAR(env->head)->content.i;
-  toss(env); if(env->err) return;
-
-  foo1= CAR(env->head)->content.i;
-  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--;
-    }
-  }
-  unprotect(loop);
-}
-
-/* Variant of for-loop */
-extern void foreach(environment *env)
-{  
-  value *loop, *foo;
-  value *iterator;
-  
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
+  if(CAR(env->head)->type==empty)
+    return;			/* Don't reverse an empty list */
 
-  if(CAR(CDR(env->head))->type!=tcons) {
+  if(CAR(env->head)->type!=tcons) {
     printerr("Bad Argument Type");
     env->err= 2;
     return;
   }
 
-  loop= CAR(env->head);
-  protect(loop);
-  toss(env); if(env->err) return;
-
-  foo= CAR(env->head);
-  protect(foo);
-  toss(env); if(env->err) return;
-
-  iterator= foo;
-
-  while(iterator->type!=empty) {
-    push_val(env, CAR(iterator));
-    push_val(env, loop);
-    eval(env); if(env->err) return;
-    if (iterator->type == tcons){
-      iterator= CDR(iterator);
-    } else {
-      printerr("Bad Argument Type"); /* Improper list */
-      env->err= 2;
-      break;
-    }
+  old_head= CAR(env->head);
+  new_head= new_val(env);
+  while(old_head->type != empty) {
+    item= old_head;
+    old_head= CDR(old_head);
+    CDR(item)= new_head;
+    new_head= item;
   }
-  unprotect(loop); unprotect(foo);
+  CAR(env->head)= new_head;
 }
 
-/* "to" */
-extern void to(environment *env)
+/* Make a list. */
+extern void pack(environment *env)
 {
-  int ending, start, i;
-  value *iterator, *temp, *end;
-
-  end= new_val(env);
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=integer 
-     || CAR(CDR(env->head))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  ending= CAR(env->head)->content.i;
-  toss(env); if(env->err) return;
-  start= CAR(env->head)->content.i;
-  toss(env); if(env->err) return;
-
-  push_sym(env, "[");
+  value *iterator, *temp, *ending;
 
-  if(ending>=start) {
-    for(i= ending; i>=start; i--)
-      push_int(env, i);
-  } else {
-    for(i= ending; i<=start; i++)
-      push_int(env, i);
-  }
+  ending=new_val(env);
 
   iterator= env->head;
-
-  if(iterator->type==empty
+  if(iterator->type == empty
      || (CAR(iterator)->type==symb
-	 && CAR(iterator)->content.sym->id[0]=='[')) {
-    temp= end;
+     && CAR(iterator)->content.sym->id[0]=='[')) {
+    temp= ending;
     toss(env);
   } else {
     /* Search for first delimiter */
-    while(CDR(iterator)->type!=empty 
+    while(CDR(iterator)->type != empty
 	  && (CAR(CDR(iterator))->type!=symb
-	      || CAR(CDR(iterator))->content.sym->id[0]!='['))
+	   || CAR(CDR(iterator))->content.sym->id[0]!='['))
       iterator= CDR(iterator);
     
     /* Extract list */
     temp= env->head;
     env->head= CDR(iterator);
-    CDR(iterator)= end;
+    CDR(iterator)= ending;
 
-    if(env->head->type!=empty)
+    if(env->head->type != empty)
       toss(env);
   }
 
   /* Push list */
-  push_val(env, temp);
-}
-
-/* Read a string */
-extern void readline(environment *env)
-{
-  readlinestream(env, env->inputstream);
-}
-
-/* Read a string from a port */
-extern void readlineport(environment *env)
-{
-  FILE *stream;
-
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
 
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  stream=CAR(env->head)->content.p;
-  readlinestream(env, stream); if(env->err) return;
-
-  swap(env); if(env->err) return;
-  toss(env);
-}
-
-/* read a line from a stream; used by readline */
-void readlinestream(environment *env, FILE *stream)
-{
-  char in_string[101];
-
-  if(fgets(in_string, 100, stream)==NULL) {
-    push_cstring(env, "");
-    if (! feof(stream)){
-      perror("readline");
-      env->err= 5;
-    }
-  } else {
-    push_cstring(env, in_string);
-  }
-}
-
-/* "read"; Read a value and place on stack */
-extern void sx_72656164(environment *env)
-{
-  readstream(env, env->inputstream);
-}
-
-/* "readport"; Read a value from a port and place on stack */
-extern void readport(environment *env)
-{
-  FILE *stream;
-
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  stream=CAR(env->head)->content.p;
-  readstream(env, stream); if(env->err) return;
-
-  swap(env); if(env->err) return;
-  toss(env);
+  push_val(env, temp);
+  rev(env);
 }
 
 /* read from a stream; used by "read" and "readport" */
@@ -1982,7 +1003,8 @@
     if(depth > 0 && env->interactive) {
       printf("]> ");
     }
-    readline(env); if(env->err) return;
+    readlinestream(env, env->inputstream);
+    if(env->err) return;
 
     if(((char *)(CAR(env->head)->content.ptr))[0]=='\0'){
       env->err= 4;		/* "" means EOF */
@@ -2042,75 +1064,7 @@
   free(match);
 
   if(depth)
-    return sx_72656164(env);
-}
-
-#ifdef __linux__
-extern void beep(environment *env)
-{
-  int freq, dur, period, ticks;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=integer
-     || CAR(CDR(env->head))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  dur= CAR(env->head)->content.i;
-  toss(env);
-  freq= CAR(env->head)->content.i;
-  toss(env);
-
-  period= 1193180/freq;		/* convert freq from Hz to period
-                                   length */
-  ticks= dur*.001193180;	/* convert duration from µseconds to
-				   timer ticks */
-
-/*    ticks=dur/1000; */
-
-      /*  if (ioctl(STDOUT_FILENO, KDMKTONE, (125<<16) + 0x637)==0) */
-  switch (ioctl(STDOUT_FILENO, KDMKTONE, (ticks<<16) | period)){
-  case 0:
-    usleep(dur);
-    return;
-  case -1:
-    perror("beep");
-    env->err= 5;
-    return;
-  default:
-    abort();
-  }
-}
-#endif /* __linux__ */
-
-/* "wait" */
-extern void sx_77616974(environment *env)
-{
-  int dur;
-
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  dur= CAR(env->head)->content.i;
-  toss(env);
-
-  usleep(dur);
+    return readstream(env, env->inputstream);
 }
 
 extern void copying(environment *env)
@@ -2398,284 +1352,6 @@
 POSSIBILITY OF SUCH DAMAGES.\n");
 }
 
-/* "*" */
-extern void sx_2a(environment *env)
-{
-  int a, b;
-  float fa, fb;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b*a);
-
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb*fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_float(env, b*fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb*a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err= 2;
-}
-
-/* "/" */
-extern void sx_2f(environment *env)
-{
-  int a, b;
-  float fa, fb;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_float(env, b/a);
-
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb/fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
-    fa= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_float(env, b/fa);
-    
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    fb= CAR(env->head)->content.f;
-    toss(env); if(env->err) return;
-    push_float(env, fb/a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err= 2;
-}
-
-/* "mod" */
-extern void mod(environment *env)
-{
-  int a, b;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, b%a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err= 2;
-}
-
-/* "div" */
-extern void sx_646976(environment *env)
-{
-  int a, b;
-  
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
-    a= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    b= CAR(env->head)->content.i;
-    toss(env); if(env->err) return;
-    push_int(env, (int)b/a);
-
-    return;
-  }
-
-  printerr("Bad Argument Type");
-  env->err= 2;
-}
-
-extern void setcar(environment *env)
-{
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CDR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  CAR(CAR(CDR(env->head)))=CAR(env->head);
-  toss(env);
-}
-
-extern void setcdr(environment *env)
-{
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CDR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  CDR(CAR(CDR(env->head)))=CAR(env->head);
-  toss(env);
-}
-
-extern void car(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  CAR(env->head)=CAR(CAR(env->head));
-}
-
-extern void cdr(environment *env)
-{
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  CAR(env->head)=CDR(CAR(env->head));
-}
-
-extern void cons(environment *env)
-{
-  value *val;
-
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
-    return;
-  }
-
-  val=new_val(env);
-  val->content.c= malloc(sizeof(pair));
-  assert(val->content.c!=NULL);
-
-  env->gc_count += sizeof(pair);
-  val->type=tcons;
-
-  CAR(val)= CAR(CDR(env->head));
-  CDR(val)= CAR(env->head);
-
-  push_val(env, val);
-
-  swap(env); if(env->err) return;
-  toss(env); if(env->err) return;
-  swap(env); if(env->err) return;
-  toss(env); if(env->err) return;
-}
-
-/*  2: 3                        =>                */
-/*  1: [ [ 1 . 2 ] [ 3 . 4 ] ]  =>  1: [ 3 . 4 ]  */
-extern void assq(environment *env)
-{
-  assocgen(env, eq);
-}
-
-
 /* General assoc function */
 void assocgen(environment *env, funcp eqfunc)
 {
@@ -2746,80 +1422,15 @@
   toss(env);
 }
 
-/* "do" */
-extern void sx_646f(environment *env)
-{
-  swap(env); if(env->err) return;
-  eval(env);
-}
-
-/* "open" */
-/* 2: "file"					*/
-/* 1: "r"	=>	1: #<port 0x47114711>	*/
-extern void sx_6f70656e(environment *env)
+/* Discard the top element of the stack. */
+extern void toss(environment *env)
 {
-  value *new_port;
-  FILE *stream;
-
-  if(env->head->type == empty || CDR(env->head)->type == empty) {
+  if(env->head->type==empty) {
     printerr("Too Few Arguments");
-    env->err=1;
-    return;
-  }
-
-  if(CAR(env->head)->type != string
-     || CAR(CDR(env->head))->type != string) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  stream=fopen(CAR(CDR(env->head))->content.ptr,
-	       CAR(env->head)->content.ptr);
-
-  if(stream == NULL) {
-    perror("open");
-    env->err= 5;
+    env->err= 1;
     return;
   }
-
-  new_port=new_val(env);
-  new_port->type=port;
-  new_port->content.p=stream;
-
-  push_val(env, new_port);
-
-  swap(env); if(env->err) return;
-  toss(env); if(env->err) return;
-  swap(env); if(env->err) return;
-  toss(env);
+  
+  env->head= CDR(env->head); /* Remove the top stack item */
 }
 
-
-/* "close" */
-extern void sx_636c6f7365(environment *env)
-{
-  int ret;
-
-  if(env->head->type == empty) {
-    printerr("Too Few Arguments");
-    env->err=1;
-    return;
-  }
-
-  if(CAR(env->head)->type != port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
-    return;
-  }
-
-  ret= fclose(CAR(env->head)->content.p);
-
-  if(ret != 0){
-    perror("close");
-    env->err= 5;
-    return;
-  }
-
-  toss(env);
-}