Ticket #205: number-to-string.diff

runtime.c

@@ -7215 +7215 @@
   }
 }
 
-
-static char *to_binary(C_uword num)
+static char *to_n_nary(C_uword num, C_uword base)
 {
   char *p;
-
-  buffer[ 66 ] = '\0';
+  char digits[] ={ '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' };
+  buffer [ 66 ] = '\0';
   p = buffer + 66;
-  
+
   do {
-    *(--p) = (num & 1) ? '1' : '0';
-    num /= 2;
-  } while(num);
+    *(--p) = digits [ num % base ];
+    num /= base;
+  } while (num);
 
   return p;
 }
@@ -7259 +7258 @@
       num = -num;
     }
 
+    if((radix < 2) || (radix > 16)){
+      barf(C_BAD_ARGUMENT_TYPE_ERROR, "number->string", C_fix(radix));
+    }
+
     switch(radix) {
-    case 2:
-      p = to_binary(num);
-      break;
-     
 #ifdef C_SIXTY_FOUR
     case 8: C_sprintf(p = buffer + 1, C_text("%lo"), num); break;
     case 10: C_sprintf(p = buffer + 1, C_text("%ld"), num); break;
@@ -7273 +7272 @@
     case 10: C_sprintf(p = buffer + 1, C_text("%d"), num); break;
     case 16: C_sprintf(p = buffer + 1, C_text("%x"), num); break;
 #endif
-
-    default: barf(C_BAD_ARGUMENT_TYPE_ERROR, "number->string", C_fix(radix));
+    default: 
+      p = to_n_nary(num, radix);
     }
   }
   else if(!C_immediatep(num) && C_block_header(num) == C_FLONUM_TAG) {
@@ -7286 +7285 @@
         f = -f;
       }
 
-      switch(radix) {
-      case 2:
-        p = to_binary((unsigned int)f);
-        goto fini;
+      if((radix < 2) || (radix > 16)){
+        barf(C_BAD_ARGUMENT_TYPE_ERROR, "number->string", C_fix(radix));
+      }
 
+      switch(radix) {
       case 8:
         C_sprintf(p = buffer, "%o", (unsigned int)f);
         goto fini;
@@ -7298 +7297 @@
       case 16:
         C_sprintf(p = buffer, "%x", (unsigned int)f);
         goto fini;
+
+      default:
+        p = to_n_nary((unsigned int)f, radix);
+        goto fini;
+
       }
     }