--- stack/stack.c	2002/02/06 00:30:14	1.35
+++ stack/stack.c	2002/02/06 00:52:31	1.36
@@ -240,7 +240,7 @@
   stackitem *temp= env->head;
 
   if((env->head)==NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -283,7 +283,7 @@
 
 extern void print_(environment *env) {
   if(env->head==NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -314,7 +314,7 @@
 extern void printstack(environment *env)
 {
   if(env->head == NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -328,13 +328,13 @@
   stackitem *temp= env->head;
   
   if((env->head)==NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
   if(env->head->next==NULL) {
-    printerr("Not enough arguments");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -360,21 +360,21 @@
   value *val;
 
   if(env->head == NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
   if(env->head->item->type!=symb) {
-    printerr("Not a symbol");
-    env->err=1;
+    printerr("Bad Argument Type");
+    env->err=2;
     return;
   }
 
   val=((symbol *)(env->head->item->content.ptr))->val;
   if(val == NULL){
-    printerr("Unbound variable");
-    env->err=1;
+    printerr("Unbound Variable");
+    env->err=3;
     return;
   }
   toss(env);		/* toss the symbol */
@@ -389,7 +389,7 @@
 {
   funcp in_func;
   if(env->head==NULL) {
-    printerr("Stack empty");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -538,11 +538,16 @@
   stackitem *temp, *new_head;
 
   /* Is top element a list? */
-  if(env->head==NULL || env->head->item->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;
+  }
 
   /* The first list element is the new stack head */
   new_head= temp= env->head->item->content.ptr;
@@ -567,7 +572,7 @@
   int result;
 
   if((env->head)==NULL || env->head->next==NULL) {
-    printerr("Not enough elements to compare");
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
@@ -586,12 +591,18 @@
 {
   int val;
 
-  if((env->head)==NULL || env->head->item->type!=integer) {
-    printerr("Stack empty or element is not a integer");
+  if((env->head)==NULL) {
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
+  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->head), !val);
@@ -611,13 +622,18 @@
   symbol *sym;
 
   /* Needs two values on the stack, the top one must be a symbol */
-  if(env->head==NULL || env->head->next==NULL 
-     || env->head->item->type!=symb) {
-    printerr("Define what?");
+  if(env->head==NULL || env->head->next==NULL) {
+    printerr("Too Few Arguments");
     env->err=1;
     return;
   }
 
+  if(env->head->item->type!=symb) {
+    printerr("Bad Argument Type");
+    env->err=2;
+    return;
+  }
+
   /* long names are a pain */
   sym=env->head->item->content.ptr;
 
@@ -667,8 +683,15 @@
   stackitem *stack_head= env->head;
   symbol **hash_entry, *temp;
 
-  if(stack_head==NULL || stack_head->item->type!=symb) {
-    printerr("Stack empty or not a symbol");
+  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;
   }
 
@@ -684,7 +707,12 @@
   }
   free(temp->id);
   free(temp);
-} 
+}
+
+/* Returns the current error number to the stack */
+extern void errn(environment *env){
+  push_int(&(env->head), env->err);
+}
 
 int main()
 {