From: mdw <mdw>
Date: Wed, 6 Dec 2000 20:32:42 +0000 (+0000)
Subject: Reduce binary bytes (to allow marker bits to be ignored).  Fix error
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/9d3838a04780e51eab9e54a2cfbb6c1829a7ecf3

Reduce binary bytes (to allow marker bits to be ignored).  Fix error
message string a bit.  Allow leading `+' signs.
---

diff --git a/mptext.c b/mptext.c
index 952ec88..a55f1c0 100644
--- a/mptext.c
+++ b/mptext.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mptext.c,v 1.7 2000/07/15 10:01:08 mdw Exp $
+ * $Id: mptext.c,v 1.8 2000/12/06 20:32:42 mdw Exp $
  *
  * Textual representation of multiprecision numbers
  *
@@ -30,6 +30,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mptext.c,v $
+ * Revision 1.8  2000/12/06 20:32:42  mdw
+ * Reduce binary bytes (to allow marker bits to be ignored).  Fix error
+ * message string a bit.  Allow leading `+' signs.
+ *
  * Revision 1.7  2000/07/15 10:01:08  mdw
  * Bug fix in binary input.
  *
@@ -169,11 +173,10 @@ mp *mp_read(mp *m, int radix, const mptext_ops *ops, void *p)
 
   /* --- Handle an initial sign --- */
 
-  if (radix >= 0 && ch == '-') {
-    f |= f_neg;
-    ch = ops->get(p);
-    while (isspace(ch))
-      ch = ops->get(p);
+  if (radix >= 0 && (ch == '-' || ch == '+')) {
+    if (ch == '-')
+      f |= f_neg;
+    do ch = ops->get(p); while isspace(ch);
   }
 
   /* --- If the radix is zero, look for leading zeros --- */
@@ -184,7 +187,7 @@ mp *mp_read(mp *m, int radix, const mptext_ops *ops, void *p)
     r = -1;
   } else if (radix < 0) {
     rd = -radix;
-    assert(((void)"binary radix must fit in a byte ", rd < UCHAR_MAX));
+    assert(((void)"binary radix must fit in a byte", rd < UCHAR_MAX));
     r = -1;
   } else if (ch != '0') {
     rd = 10;
@@ -234,7 +237,7 @@ mp *mp_read(mp *m, int radix, const mptext_ops *ops, void *p)
     /* --- Check that the character is a digit and in range --- */
 
     if (radix < 0)
-      x = ch;
+      x = ch % rd;
     else {
       if (!isalnum(ch))
 	break;