/* -*-c-*-
*
- * $Id: mptext.c,v 1.11 2001/06/16 23:42:17 mdw Exp $
+ * $Id: mptext.c,v 1.15 2002/10/15 19:18:15 mdw Exp $
*
* Textual representation of multiprecision numbers
*
/*----- Revision history --------------------------------------------------*
*
* $Log: mptext.c,v $
+ * Revision 1.15 2002/10/15 19:18:15 mdw
+ * Fix fencepost bugs in binary radix writing.
+ *
+ * Revision 1.14 2002/10/09 00:33:44 mdw
+ * Allow `0o' and `0b' prefixes for octal and binary (from Haskell)
+ *
+ * Revision 1.13 2002/10/09 00:21:06 mdw
+ * Allow user-specified `r_xx' bases to be up to 62.
+ *
+ * Revision 1.12 2002/01/13 19:51:18 mdw
+ * Extend the textual format to bases up to 62 by distinguishing case.
+ *
* Revision 1.11 2001/06/16 23:42:17 mdw
* Typesetting fixes.
*
/* --- If the radix is zero, look for leading zeros --- */
if (radix > 0) {
- assert(((void)"ascii radix must be <= 36", radix <= 36));
+ assert(((void)"ascii radix must be <= 62", radix <= 62));
rd = radix;
r = -1;
} else if (radix < 0) {
r = 0;
} else {
ch = ops->get(p);
- if (ch == 'x') {
- ch = ops->get(p);
- rd = 16;
- } else {
- rd = 8;
- f |= f_ok;
+ switch (ch) {
+ case 'x':
+ rd = 16;
+ goto prefix;
+ case 'o':
+ rd = 8;
+ goto prefix;
+ case 'b':
+ rd = 2;
+ goto prefix;
+ prefix:
+ ch = ops->get(p);
+ break;
+ default:
+ rd = 8;
+ f |= f_ok;
}
r = -1;
}
if (ch >= '0' && ch <= '9')
x = ch - '0';
else {
- ch = tolower(ch);
+ if (rd <= 36)
+ ch = tolower(ch);
if (ch >= 'a' && ch <= 'z') /* ASCII dependent! */
x = ch - 'a' + 10;
+ else if (ch >= 'A' && ch <= 'Z')
+ x = ch - 'A' + 36;
else
break;
}
/* --- An underscore indicates a numbered base --- */
- if (ch == '_' && r > 0 && r <= 36) {
+ if (ch == '_' && r > 0 && r <= 62) {
unsigned i;
/* --- Clear out the stacks --- */
if (ch >= '0' && ch <= '9')
x = ch - '0';
else {
- ch = tolower(ch);
+ if (rd <= 36)
+ ch = tolower(ch);
if (ch >= 'a' && ch <= 'z') /* ASCII dependent! */
x = ch - 'a' + 10;
+ else if (ch >= 'A' && ch <= 'Z')
+ x = ch - 'A' + 36;
else
break;
}
ch = x;
else if (x < 10)
ch = '0' + x;
- else
+ else if (x < 36) /* Ascii specific */
ch = 'a' + x - 10;
+ else
+ ch = 'A' + x - 36;
buf[--i] = ch;
if (z)
z--;
/* --- Work out where to start --- */
n = mp_bits(m);
- n += bit - (n % bit);
+ if (n % bit)
+ n += bit - (n % bit);
b = n % MPW_BITS;
n /= MPW_BITS;
-
- if (n > MP_LEN(m)) {
+
+ if (n >= MP_LEN(m)) {
n--;
b += MPW_BITS;
}
ch = x;
else if (x < 10)
ch = '0' + x;
+ else if (x < 36)
+ ch = 'a' + x - 10; /* Ascii specific */
else
- ch = 'a' + x - 10;
+ ch = 'A' + x - 36;
*q++ = ch;
if (q >= buf + sizeof(buf)) {
if ((rc = ops->put(buf, sizeof(buf), p)) != 0)
ch = x;
else if (x < 10)
ch = '0' + x;
+ else if (x < 36)
+ ch = 'a' + x - 10; /* Ascii specific */
else
- ch = 'a' + x - 10;
+ ch = 'A' + x - 36;
*q++ = ch;
rc = ops->put(buf, q - buf, p);
{
int rc;
+ if (MP_EQ(m, MP_ZERO))
+ return (ops->put("0", 1, p));
+
/* --- Set various things up --- */
m = MP_COPY(m);
/* --- Check the radix for sensibleness --- */
if (radix > 0)
- assert(((void)"ascii radix must be <= 36", radix <= 36));
+ assert(((void)"ascii radix must be <= 62", radix <= 62));
else if (radix < 0)
assert(((void)"binary radix must fit in a byte", -radix < UCHAR_MAX));
else