--- stack/stack.c	2002/03/08 06:44:15	1.92
+++ stack/stack.c	2002/03/08 16:09:30	1.93
@@ -118,15 +118,15 @@
   stackitem *nitem= malloc(sizeof(stackitem));
 
   nval->content.ptr= NULL;
-  protect(env, nval);
-
-  gc_init(env);
 
   nitem->item= nval;
   nitem->next= env->gc_ref;
   env->gc_ref= nitem;
 
   env->gc_count++;
+
+  protect(env, nval);
+  gc_init(env);
   unprotect(env);
 
   return nval;
@@ -151,31 +151,35 @@
 }
 
 extern void gc_init(environment *env) {
-  stackitem *new_head= NULL, *titem, *iterator= env->gc_ref;
+  stackitem *new_head= NULL, *titem, *iterator;
   symbol *tsymb;
   int i;
 
   if(env->gc_count < env->gc_limit)
     return;
 
+  /* Garb by default */
+  iterator= env->gc_ref;
   while(iterator!=NULL) {
     iterator->item->gc_garb= 1;
     iterator= iterator->next;
   }
 
-  /* Mark */
+  /* Mark protected values */
   iterator= env->gc_protect;
   while(iterator!=NULL) {
     gc_mark(iterator->item);
     iterator= iterator->next;
   }
 
+  /* Mark values in stack */
   iterator= env->head;
   while(iterator!=NULL) {
     gc_mark(iterator->item);
     iterator= iterator->next;
   }
 
+  /* Mark values in hashtable */
   for(i= 0; i<HASHTBLSIZE; i++) {
     tsymb= env->symbols[i];
     while(tsymb!=NULL) {
@@ -190,12 +194,12 @@
   while(env->gc_ref!=NULL) {
 
     if(env->gc_ref->item->gc_garb) {
-      switch(env->gc_ref->item->type) {
+
+      /* Remove content */
+      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;
@@ -206,11 +210,11 @@
       default:
 	break;
       }
-      free(env->gc_ref->item);
+      free(env->gc_ref->item);	/* Remove from gc_ref */
       titem= env->gc_ref->next;
-      free(env->gc_ref);
+      free(env->gc_ref);	/* Remove value */
       env->gc_ref= titem;
-    } else {
+    } else {			/* Save */
       titem= env->gc_ref->next;
       env->gc_ref->next= new_head;
       new_head= env->gc_ref;
@@ -252,12 +256,22 @@
 {
   value *new_value= new_val(env);
   
-  new_value->content.val= in_val;
+  new_value->content.i= in_val;
   new_value->type= integer;
 
   push_val(env, new_value);
 }
 
+void push_float(environment *env, float in_val)
+{
+  value *new_value= new_val(env);
+
+  new_value->content.f= in_val;
+  new_value->type= tfloat;
+
+  push_val(env, new_value);
+}
+
 /* Copy a string onto the stack. */
 void push_cstring(environment *env, const char *in_string)
 {
@@ -328,6 +342,9 @@
   char *mangled;		/* Mangled function name */
 
   new_value= new_val(env);
+  protect(env, new_value);
+  new_fvalue= new_val(env);
+  protect(env, new_fvalue);
 
   /* The new value is a symbol */
   new_value->type= symb;
@@ -362,7 +379,6 @@
       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
@@ -370,6 +386,7 @@
     }
   }
   push_val(env, new_value);
+  unprotect(env); unprotect(env);
 }
 
 /* Print newline. */
@@ -393,6 +410,9 @@
   case integer:
     push_sym(env, "integer");
     break;
+  case tfloat:
+    push_sym(env, "float");
+    break;
   case string:
     push_sym(env, "string");
     break;
@@ -413,7 +433,10 @@
 {
   switch(stack_head->item->type) {
   case integer:
-    printf("%d", stack_head->item->content.val);
+    printf("%d", stack_head->item->content.i);
+    break;
+  case tfloat:
+    printf("%f", stack_head->item->content.f);
     break;
   case string:
     if(noquote)
@@ -597,10 +620,9 @@
   case list:
     temp_val= env->head->item;
     protect(env, temp_val);
-    toss(env);
-    if(env->err) return;
+
+    toss(env); if(env->err) return;
     iterator= (stackitem*)temp_val->content.ptr;
-    unprotect(env);
     
     while(iterator!=NULL) {
       push_val(env, iterator->item);
@@ -618,6 +640,7 @@
       }
       iterator= iterator->next;
     }
+    unprotect(env);
     return;
 
   default:
@@ -659,6 +682,8 @@
   value *pack;
 
   iterator= env->head;
+  pack= new_val(env);
+  protect(env, pack);
 
   if(iterator==NULL
      || (iterator->item->type==symb
@@ -676,18 +701,20 @@
     temp= env->head;
     env->head= iterator->next;
     iterator->next= NULL;
+
+    pack->type= list;
+    pack->content.ptr= temp;
     
     if(env->head!=NULL)
       toss(env);
   }
 
   /* Push list */
-  pack= new_val(env);
-  pack->type= list;
-  pack->content.ptr= temp;
 
   push_val(env, pack);
   rev(env);
+
+  unprotect(env);
 }
 
 /* Relocate elements of the list on the stack. */
@@ -765,7 +792,7 @@
     return;
   }
 
-  val= env->head->item->content.val;
+  val= env->head->item->content.i;
   toss(env);
   push_int(env, !val);
 }
@@ -930,7 +957,7 @@
   }
 
   if(myenv.interactive) {
-    printf("Stack version $Revision: 1.92 $\n\
+    printf("Stack version $Revision: 1.93 $\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\
@@ -967,6 +994,7 @@
 /* "+" */
 extern void sx_2b(environment *env) {
   int a, b;
+  float fa, fb;
   size_t len;
   char* new_string;
   value *a_val, *b_val;
@@ -991,26 +1019,62 @@
     push_cstring(env, new_string);
     unprotect(env); unprotect(env);
     free(new_string);
+    
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b+a);
+
     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);
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==tfloat) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_float(env, fb+fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==integer) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_float(env, b+fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==integer
+     && env->head->next->item->type==tfloat) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    fb= env->head->item->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)==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
@@ -1018,23 +1082,58 @@
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b-a);
+
     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);
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==tfloat) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_float(env, fb-fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==integer) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_float(env, b-fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==integer
+     && env->head->next->item->type==tfloat) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    fb= env->head->item->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)==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
@@ -1042,41 +1141,93 @@
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b>a);
+
     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);
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==tfloat) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_int(env, fb>fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==integer) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b>fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==integer
+     && env->head->next->item->type==tfloat) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    fb= env->head->item->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){
   stackitem *old_item, *new_item, *prev_item;
-
-  value *new_value= new_val(env);
+  value *new_value;
 
   protect(env, old_value);
+  new_value= new_val(env);
+  protect(env, new_value);
   new_value->type= old_value->type;
 
   switch(old_value->type){
+  case tfloat:
   case integer:
-    new_value->content.val= old_value->content.val;
+  case func:
+  case symb:
+    new_value->content= old_value->content;
     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;
 
@@ -1098,7 +1249,7 @@
     break;
   }
 
-  unprotect(env);
+  unprotect(env); unprotect(env);
 
   return new_value;
 }
@@ -1133,7 +1284,7 @@
   swap(env);
   if(env->err) return;
   
-  truth=env->head->item->content.val;
+  truth=env->head->item->content.i;
 
   toss(env);
   if(env->err) return;
@@ -1165,7 +1316,7 @@
   rot(env);
   if(env->err) return;
   
-  truth=env->head->item->content.val;
+  truth=env->head->item->content.i;
 
   toss(env);
   if(env->err) return;
@@ -1210,7 +1361,7 @@
       return;
     }
     
-    truth= env->head->item->content.val;
+    truth= env->head->item->content.i;
     toss(env); if(env->err) return;
     
     if(truth) {
@@ -1249,10 +1400,10 @@
   protect(env, loop);
   toss(env); if(env->err) return;
 
-  foo2= env->head->item->content.val;
+  foo2= env->head->item->content.i;
   toss(env); if(env->err) return;
 
-  foo1= env->head->item->content.val;
+  foo1= env->head->item->content.i;
   toss(env); if(env->err) return;
 
   if(foo1<=foo2) {
@@ -1329,9 +1480,9 @@
     return;
   }
 
-  ending= env->head->item->content.val;
+  ending= env->head->item->content.i;
   toss(env); if(env->err) return;
-  start= env->head->item->content.val;
+  start= env->head->item->content.i;
   toss(env); if(env->err) return;
 
   temp_head= env->head;
@@ -1346,10 +1497,14 @@
   }
 
   temp_val= new_val(env);
+  protect(env, temp_val);
+
   temp_val->content.ptr= env->head;
   temp_val->type= list;
   env->head= temp_head;
   push_val(env, temp_val);
+
+  unprotect(env);
 }
 
 /* Read a string */
@@ -1367,14 +1522,17 @@
   const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%n";
   const char strform[]= "\"%[^\"]\"%n";
   const char intform[]= "%i%n";
+  const char fltform[]= "%f%n";
   const char blankform[]= "%*[ \t]%n";
   const char ebrackform[]= "]%n";
   const char semicform[]= ";%n";
   const char bbrackform[]= "[%n";
 
   int itemp, readlength= -1;
+  int count= -1;
+  float ftemp;
   static int depth= 0;
-  char *match;
+  char *match, *ctemp;
   size_t inlength;
 
   if(env->in_string==NULL) {
@@ -1397,12 +1555,17 @@
   inlength= strlen(env->in_string)+1;
   match= malloc(inlength);
 
-  if(sscanf(env->in_string, blankform, &readlength)!=EOF
+  if(sscanf(env->in_string, blankform, &readlength) != EOF
      && readlength != -1) {
     ; 
-  } else if(sscanf(env->in_string, intform, &itemp, &readlength) != EOF
+  } else if(sscanf(env->in_string, fltform, &ftemp, &readlength) != EOF
 	    && readlength != -1) {
-    push_int(env, itemp);
+    if(sscanf(env->in_string, intform, &itemp, &count) != EOF
+       && count==readlength) {
+      push_int(env, itemp);
+    } else {
+      push_float(env, ftemp);
+    }
   } else if(sscanf(env->in_string, strform, match, &readlength) != EOF
 	    && readlength != -1) {
     push_cstring(env, match);
@@ -1424,7 +1587,7 @@
     free(env->free_string);
     env->in_string = env->free_string = NULL;
   }
-  if ( env->in_string != NULL) {
+  if (env->in_string != NULL) {
     env->in_string += readlength;
   }
 
@@ -1451,9 +1614,9 @@
     return;
   }
 
-  dur=env->head->item->content.val;
+  dur=env->head->item->content.i;
   toss(env);
-  freq=env->head->item->content.val;
+  freq=env->head->item->content.i;
   toss(env);
 
   period=1193180/freq;		/* convert freq from Hz to period
@@ -1494,7 +1657,7 @@
     return;
   }
 
-  dur=env->head->item->content.val;
+  dur=env->head->item->content.i;
   toss(env);
 
   usleep(dur);
@@ -1787,6 +1950,7 @@
 extern void sx_2a(environment *env)
 {
   int a, b;
+  float fa, fb;
 
   if((env->head)==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
@@ -1794,24 +1958,59 @@
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b*a);
+
     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);
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==tfloat) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_float(env, fb*fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==integer) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_float(env, b*fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==integer
+     && env->head->next->item->type==tfloat) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    fb= env->head->item->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)==NULL || env->head->next==NULL) {
     printerr("Too Few Arguments");
@@ -1819,18 +2018,52 @@
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b=env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_float(env, b/a);
+
     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);
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==tfloat) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_float(env, fb/fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==tfloat
+     && env->head->next->item->type==integer) {
+    fa= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_float(env, b/fa);
+    
+    return;
+  }
+
+  if(env->head->item->type==integer
+     && env->head->next->item->type==tfloat) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    fb= env->head->item->content.f;
+    toss(env); if(env->err) return;
+    push_float(env, fb/a);
+
+    return;
+  }
+
+  printerr("Bad Argument Type");
+  env->err=2;
 }
 
 /* "mod" */
@@ -1844,16 +2077,17 @@
     return;
   }
   
-  if(env->head->item->type!=integer
-     || env->head->next->item->type!=integer) {
-    printerr("Bad Argument Type");
-    env->err=2;
+  if(env->head->item->type==integer
+     && env->head->next->item->type==integer) {
+    a= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    b= env->head->item->content.i;
+    toss(env); if(env->err) return;
+    push_int(env, b%a);
+
     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);
+  printerr("Bad Argument Type");
+  env->err=2;
 }