--- stack/symbols.c	2003/08/04 11:23:43	1.1
+++ stack/symbols.c	2003/08/11 14:31:48	1.6
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include "stack.h"
+#include "messages.h"
 
 /* Print newline. */
 extern void nl(environment *env)
@@ -10,16 +10,15 @@
 /* Print a newline to a port */
 extern void nlport(environment *env)
 {
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, port, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   if(fprintf(CAR(env->head)->content.p, "\n") < 0){
@@ -33,16 +32,25 @@
 /* Gets the type of a value */
 extern void type(environment *env)
 {
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+
+  switch(check_args(env, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   switch(CAR(env->head)->type){
   case empty:
     push_sym(env, "empty");
     break;
+  case unknown:
+    push_sym(env, "unknown");
+    break;
   case integer:
     push_sym(env, "integer");
     break;
@@ -73,11 +81,18 @@
 /* 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;
+
+  switch(check_args(env, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
+  case 2:
+    printerr(env, "Bad Argument Type");
+    return;
+  default:
+    break;
   }
+
   print_val(env, CAR(env->head), 0, NULL, stdout);
   if(env->err) return;
   nl(env);
@@ -95,11 +110,18 @@
    discard it. */
 extern void princ_(environment *env)
 {
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+
+  switch(check_args(env, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
+
   print_val(env, CAR(env->head), 1, NULL, stdout);
 }
 
@@ -114,16 +136,16 @@
 /* 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;
+  switch(check_args(env, port, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   print_val(env, CAR(CDR(env->head)), 0, NULL, CAR(env->head)->content.p);
@@ -142,16 +164,16 @@
 /* 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;
+  switch(check_args(env, port, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
+  case 2:
+    printerr(env, "Bad Argument Type");
+    return;
+  default:
+    break;
   }
 
   print_val(env, CAR(CDR(env->head)), 1, NULL, CAR(env->head)->content.p);
@@ -170,12 +192,16 @@
 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;
+
+  switch(check_args(env, unknown, unknown, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
   
   env->head= CDR(CDR(env->head));
@@ -188,17 +214,15 @@
 {
   value *temp, *new_head;
 
-  /* Is top element a list? */
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, tcons, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   rev(env);
@@ -211,12 +235,13 @@
 
   toss(env);
 
+  /// XXX
   /* 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 */
+      printerr(env, "Bad Argument Type"); /* Improper list */
       env->err= 2;
       return;
     }
@@ -233,10 +258,15 @@
 {
   void *left, *right;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, unknown, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
+  case 2:
+    printerr(env, "Bad Argument Type");
+    return;
+  default:
+    break;
   }
 
   left= CAR(env->head)->content.ptr;
@@ -251,16 +281,15 @@
 {
   int val;
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   val= CAR(env->head)->content.i;
@@ -281,20 +310,19 @@
   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;
+  switch(check_args(env, symb, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=symb) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   /* long names are a pain */
-  sym= CAR(env->head)->content.ptr;
+  sym= CAR(env->head)->content.sym;
 
   /* Bind the symbol to the value */
   sym->val= CAR(CDR(env->head));
@@ -305,8 +333,7 @@
 /* Clear stack */
 extern void clear(environment *env)
 {
-  while(env->head->type != empty)
-    toss(env);
+  env->head= new_val(env);
 }
 
 /* Forgets a symbol (remove it from the hash table) */
@@ -314,16 +341,15 @@
 {
   char* sym_id;
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, symb, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-  
-  if(CAR(env->head)->type!=symb) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   sym_id= CAR(env->head)->content.sym->id;
@@ -347,24 +373,22 @@
   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;
+  if(check_args(env, unknown, unknown, empty)==1) {
+    printerr(env, "Too Few Arguments");
     return;
   }
 
-  if(CAR(env->head)->type==string
-     && CAR(CDR(env->head))->type==string) {
+  if(check_args(env, string, string, empty)==0) {
     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;
+    len= strlen(a_val->content.string)+strlen(b_val->content.string)+1;
     new_string= malloc(len);
     assert(new_string != NULL);
-    strcpy(new_string, b_val->content.ptr);
-    strcat(new_string, a_val->content.ptr);
+    strcpy(new_string, b_val->content.string);
+    strcat(new_string, a_val->content.string);
     push_cstring(env, new_string);
     unprotect(a_val); unprotect(b_val);
     free(new_string);
@@ -372,8 +396,7 @@
     return;
   }
   
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
+  if(check_args(env, integer, integer, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -383,8 +406,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, tfloat, tfloat, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -394,8 +416,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
+  if(check_args(env, tfloat, integer, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -405,8 +426,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, integer, tfloat, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -416,7 +436,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err=2;
 }
 
@@ -426,14 +446,12 @@
   int a, b;
   float fa, fb;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err=1;
+  if(check_args(env, unknown, unknown, empty)==1) {
+    printerr(env, "Too Few Arguments");
     return;
   }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
+
+  if(check_args(env, integer, integer, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -443,8 +461,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, tfloat, tfloat, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -454,8 +471,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
+  if(check_args(env, tfloat, integer, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -465,8 +481,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, integer, tfloat, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -476,7 +491,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err=2;
 }
 
@@ -486,14 +501,12 @@
   int a, b;
   float fa, fb;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  if(check_args(env, unknown, unknown, empty)==1) {
+    printerr(env, "Too Few Arguments");
     return;
   }
-  
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==integer) {
+
+  if(check_args(env, integer, integer, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -503,8 +516,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, tfloat, tfloat, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -514,8 +526,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==tfloat
-     && CAR(CDR(env->head))->type==integer) {
+  if(check_args(env, tfloat, integer, empty)==0) {
     fa= CAR(env->head)->content.f;
     toss(env); if(env->err) return;
     b= CAR(env->head)->content.i;
@@ -525,8 +536,7 @@
     return;
   }
 
-  if(CAR(env->head)->type==integer
-     && CAR(CDR(env->head))->type==tfloat) {
+  if(check_args(env, integer, tfloat, empty)==0) {
     a= CAR(env->head)->content.i;
     toss(env); if(env->err) return;
     fb= CAR(env->head)->content.f;
@@ -536,7 +546,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err= 2;
 }
 
@@ -564,11 +574,17 @@
 /* "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;
+  switch(check_args(env, unknown, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
+  case 2:
+    printerr(env, "Bad Argument Type");
+    return;
+  default:
+    break;
   }
+
   push_val(env, copy_val(env, CAR(env->head)));
 }
 
@@ -577,18 +593,17 @@
 {
   int truth;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, unknown, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(CDR(env->head))->type != integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
-  
+
   swap(env);
   if(env->err) return;
   
@@ -608,19 +623,17 @@
 {
   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;
+  switch(check_args(env, unknown, unknown, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(CDR(CDR(env->head)))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
-  
+
   rot(env);
   if(env->err) return;
   
@@ -642,19 +655,27 @@
 /* "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;
+
+  switch(check_args(env, 
+		    unknown, symb, unknown, symb, integer,
+		    empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
+  /// XXX
+
   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");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -665,16 +686,23 @@
 
 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;
+   
+  switch(check_args(env, unknown, symb, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
+  /// XXX
+
   if(CAR(CDR(env->head))->type!=symb
      || strcmp(CAR(CDR(env->head))->content.sym->id, "if")!=0) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -689,10 +717,15 @@
   int truth;
   value *loop, *test;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, unknown, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   loop= CAR(env->head);
@@ -706,9 +739,11 @@
   do {
     push_val(env, test);
     eval(env);
+
+    /// XXX
     
     if(CAR(env->head)->type != integer) {
-      printerr("Bad Argument Type");
+      printerr(env, "Bad Argument Type");
       env->err= 2;
       return;
     }
@@ -735,18 +770,15 @@
   value *loop;
   int foo1, foo2;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty 
-     || CDR(CDR(env->head))->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, unknown, integer, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(CDR(env->head))->type!=integer
-     || CAR(CDR(CDR(env->head)))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   loop= CAR(env->head);
@@ -783,19 +815,18 @@
 {  
   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(CDR(env->head))->type!=tcons) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  switch(check_args(env, unknown, tcons, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
+    return;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
-
+  
   loop= CAR(env->head);
   protect(loop);
   toss(env); if(env->err) return;
@@ -810,10 +841,12 @@
     push_val(env, CAR(iterator));
     push_val(env, loop);
     eval(env); if(env->err) return;
+
+    /// XXX
     if (iterator->type == tcons){
       iterator= CDR(iterator);
     } else {
-      printerr("Bad Argument Type"); /* Improper list */
+      printerr(env, "Bad Argument Type"); /* Improper list */
       env->err= 2;
       break;
     }
@@ -827,21 +860,19 @@
   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;
+  switch(check_args(env, integer, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=integer 
-     || CAR(CDR(env->head))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
+  end= new_val(env);
+
   ending= CAR(env->head)->content.i;
   toss(env); if(env->err) return;
   start= CAR(env->head)->content.i;
@@ -895,16 +926,15 @@
 {
   FILE *stream;
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, port, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   stream=CAR(env->head)->content.p;
@@ -925,16 +955,15 @@
 {
   FILE *stream;
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, port, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=port) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   stream=CAR(env->head)->content.p;
@@ -949,17 +978,15 @@
 {
   int freq, dur, period, ticks;
 
-  if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, integer, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=integer
-     || CAR(CDR(env->head))->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   dur= CAR(env->head)->content.i;
@@ -994,16 +1021,15 @@
 {
   int dur;
 
-  if(env->head->type==empty) {
-    printerr("Too Few Arguments");
-    env->err= 1;
+  switch(check_args(env, integer, empty)) {
+  case 1:
+    printerr(env, "Too Few Arguments");
     return;
-  }
-
-  if(CAR(env->head)->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err= 2;
+  case 2:
+    printerr(env, "Bad Argument Type");
     return;
+  default:
+    break;
   }
 
   dur= CAR(env->head)->content.i;
@@ -1012,6 +1038,9 @@
   usleep(dur);
 }
 
+/// XXXXXX
+
+
 /* "*" */
 extern void sx_2a(environment *env)
 {
@@ -1019,7 +1048,7 @@
   float fa, fb;
 
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
@@ -1068,7 +1097,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err= 2;
 }
 
@@ -1079,7 +1108,7 @@
   float fa, fb;
 
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
@@ -1128,7 +1157,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err= 2;
 }
 
@@ -1138,7 +1167,7 @@
   int a, b;
 
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
@@ -1154,7 +1183,7 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "Bad Argument Type");
   env->err= 2;
 }
 
@@ -1164,7 +1193,7 @@
   int a, b;
   
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
@@ -1180,20 +1209,20 @@
     return;
   }
 
-  printerr("Bad Argument Type");
+  printerr(env, "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");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
 
   if(CDR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1205,13 +1234,13 @@
 extern void setcdr(environment *env)
 {
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
 
   if(CDR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1223,13 +1252,13 @@
 extern void car(environment *env)
 {
   if(env->head->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
 
   if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1240,13 +1269,13 @@
 extern void cdr(environment *env)
 {
   if(env->head->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
 
   if(CAR(env->head)->type!=tcons) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1259,7 +1288,7 @@
   value *val;
 
   if(env->head->type==empty || CDR(env->head)->type==empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err= 1;
     return;
   }
@@ -1282,6 +1311,78 @@
   toss(env); if(env->err) return;
 }
 
+
+/* General assoc function */
+void assocgen(environment *env, funcp eqfunc)
+{
+  value *key, *item;
+
+  /* Needs two values on the stack, the top one must be an association
+     list */
+  if(env->head->type==empty || CDR(env->head)->type==empty) {
+    printerr(env, "Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+
+  if(CAR(env->head)->type!=tcons) {
+    printerr(env, "Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  key=CAR(CDR(env->head));
+  item=CAR(env->head);
+
+  while(item->type == tcons){
+    if(CAR(item)->type != tcons){
+      printerr(env, "Bad Argument Type");
+      env->err= 2;
+      return;
+    }
+    push_val(env, key);
+    push_val(env, CAR(CAR(item)));
+    eqfunc(env); if(env->err) return;
+
+    /* Check the result of 'eqfunc' */
+    if(env->head->type==empty) {
+      printerr(env, "Too Few Arguments");
+      env->err= 1;
+    return;
+    }
+    if(CAR(env->head)->type!=integer) {
+      printerr(env, "Bad Argument Type");
+      env->err= 2;
+      return;
+    }
+
+    if(CAR(env->head)->content.i){
+      toss(env); if(env->err) return;
+      break;
+    }
+    toss(env); if(env->err) return;
+
+    if(item->type!=tcons) {
+      printerr(env, "Bad Argument Type");
+      env->err= 2;
+      return;
+    }
+
+    item=CDR(item);
+  }
+
+  if(item->type == tcons){	/* A match was found */
+    push_val(env, CAR(item));
+  } else {
+    push_int(env, 0);
+  }
+  swap(env); if(env->err) return;
+  toss(env); if(env->err) return;
+  swap(env); if(env->err) return;
+  toss(env);
+}
+
+
 /*  2: 3                        =>                */
 /*  1: [ [ 1 . 2 ] [ 3 . 4 ] ]  =>  1: [ 3 . 4 ]  */
 extern void assq(environment *env)
@@ -1306,14 +1407,14 @@
   FILE *stream;
 
   if(env->head->type == empty || CDR(env->head)->type == empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err=1;
     return;
   }
 
   if(CAR(env->head)->type != string
      || CAR(CDR(env->head))->type != string) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1346,13 +1447,13 @@
   int ret;
 
   if(env->head->type == empty) {
-    printerr("Too Few Arguments");
+    printerr(env, "Too Few Arguments");
     env->err=1;
     return;
   }
 
   if(CAR(env->head)->type != port) {
-    printerr("Bad Argument Type");
+    printerr(env, "Bad Argument Type");
     env->err= 2;
     return;
   }
@@ -1367,3 +1468,152 @@
 
   toss(env);
 }
+
+extern void mangle(environment *env)
+{
+  char *new_string;
+
+  if(env->head->type==empty) {
+    printerr(env, "Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+
+  if(CAR(env->head)->type!=string) {
+    printerr(env, "Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  new_string= mangle_str(CAR(env->head)->content.string);
+
+  toss(env);
+  if(env->err) return;
+
+  push_cstring(env, new_string);
+}
+
+/* "fork" */
+extern void sx_666f726b(environment *env)
+{
+  push_int(env, fork());
+}
+
+/* "waitpid" */
+extern void sx_77616974706964(environment *env)
+{
+
+  if(env->head->type==empty) {
+    printerr(env, "Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+
+  if(CAR(env->head)->type!=integer) {
+    printerr(env, "Bad Argument Type");
+    env->err= 2;
+    return;
+  }
+
+  push_int(env, waitpid(CAR(env->head)->content.i, NULL, 0));
+  swap(env); toss(env);
+}
+
+
+/* Discard the top element of the stack. */
+extern void toss(environment *env)
+{
+  if(env->head->type==empty) {
+    printerr(env, "Too Few Arguments");
+    env->err= 1;
+    return;
+  }
+  
+  env->head= CDR(env->head); /* Remove the top stack item */
+}
+
+
+/* Quit stack. */
+extern void quit(environment *env)
+{
+  int i;
+
+  env->head= new_val(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;
+  }
+
+  env->gc_limit= 0;
+  gc_maybe(env);
+
+  words(env);
+
+  if(env->free_string!=NULL)
+    free(env->free_string);
+  
+#ifdef __linux__
+  muntrace();
+#endif
+
+  exit(EXIT_SUCCESS);
+}
+
+
+/* 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 ", temp->id);
+      temp= temp->next;
+    }
+  }
+}
+
+
+/* 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");
+}
+
+
+/* Prints the stack. */
+extern void printstack(environment *env)
+{
+  if(env->head->type == empty) {
+    printf("Stack Empty\n");
+    return;
+  }
+
+  print_st(env, env->head, 1);
+}
+
+
+extern void copying(environment *env)
+{
+  printf(license_message);
+}
+
+
+extern void warranty(environment *env)
+{
+  printf(warranty_message);
+}