Updated documentation. In particular, mpfr_set_str_raw renamed

as mpfr_set_str_binary. This function and mpfr_print_binary are
now internal functions. mpfr_print_binary no longer prints the
non-significant 0 bits. Updated the source to match the manual.
mpfr_print_binary has been completely rewritten (now directly
prints to stdout, without using an intermediate string). In
mpfr_set_str_binary, replaced atol by strtol + error checking.


git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/trunk@2466 280ebfd0-de03-0410-8827-d642c229c3f4

1 files changed, 76 insertions, 64 deletions

diff --git a/set_str_raw.c b/set_str_raw.c
index 451fb53c1..ecb724660 100644
--- a/set_str_raw.c
+++ b/set_str_raw.c
@@ -1,4 +1,4 @@
-/* mpfr_set_str_raw -- set a floating-point number from a binary string
+/* mpfr_set_str_binary -- set a floating-point number from a binary string
 
 Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
@@ -19,31 +19,31 @@ along with the MPFR Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA. */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include "gmp.h"
 #include "gmp-impl.h"
 #include "longlong.h"
 #include "mpfr.h"
 #include "mpfr-impl.h"
 
-/* Currently the number should be of the form +/- xxxx.xxxxxxEyy, with 
-   decimal exponent. The mantissa of x is supposed to be large enough 
+/* Currently the number should be of the form +/- xxxx.xxxxxxEyy, with
+   decimal exponent. The mantissa of x is supposed to be large enough
    to hold all the bits of str. */
 
 void
-mpfr_set_str_raw (mpfr_ptr x, const char *str)
+mpfr_set_str_binary (mpfr_ptr x, const char *str)
 {
-  char *str2, *str0, negative = 0; 
+  char *str2, *str0, negative = 0;
   unsigned long j, l, k = 0, xsize, cnt, alloc;
-  mp_limb_t *xp; 
+  mp_limb_t *xp;
   long expn = 0, e;
   char *endstr2;
 
   xp = MPFR_MANT(x);
   xsize = 1 + (MPFR_PREC(x) - 1) / BITS_PER_MP_LIMB;
-  alloc = (strlen(str) + 1) * sizeof(char);
+  alloc = strlen(str) + 1;
 
   if (*str == '-')
     {
@@ -52,7 +52,7 @@ mpfr_set_str_raw (mpfr_ptr x, const char *str)
     }
   else if (*str == '+')
     str++;
-  
+
   if (*str == 'N')
     {
       MPFR_SET_NAN(x);
@@ -60,85 +60,97 @@ mpfr_set_str_raw (mpfr_ptr x, const char *str)
       return;
     }
 
-  if (*str == 'I') 
-    { 
+  if (*str == 'I')
+    {
       MPFR_CLEAR_NAN(x);
       MPFR_SET_INF(x);
       if (MPFR_ISNEG(x) != negative)
 	MPFR_CHANGE_SIGN(x);
-      return; 
+      return;
     }
-     
+
   MPFR_CLEAR_FLAGS(x);
- 
+
   str0 = str2 = (char *) (*__gmp_allocate_func) (alloc);
 
-  while (*str == '0') { str++; } 
+  while (*str == '0')
+    str++;
 
   while (*str == '0' || *str == '1')
-    { *(str2++) = *(str++); k++; }
+    {
+      *(str2++) = *(str++);
+      k++;
+    }
 
-  if (*str == '.') 
+  if (*str == '.')
     {
       str++;
       while (*str == '0' || *str == '1')
-	{ *(str2++) = *(str++); }
+        {
+          *(str2++) = *(str++);
+        }
 
-      if (*str == '[') { while (*str != ']') str++; }
+      if (*str == '[')
+        while (*str != ']')
+          str++;
     }
-    
-  if (*str == '[') { while (*str != ']') str++; }
 
-  if (*str == 'e' || *str == 'E') 
+  if (*str == '[')
+    while (*str != ']')
+      str++;
+
+  if (*str == 'e' || *str == 'E')
     {
-      e = atol(++str); /* signed exponent after 'e' or 'E' */
-      expn = k + e; 
-      if (expn < e)
-	  fprintf(stderr, "Warning: overflow in exponent in Str -> mpfr\n"); 
+      char *end;
+
+      e = strtol (++str, &end, 10); /* signed exponent after 'e' or 'E' */
+      MPFR_ASSERTN (*end == '\0' && errno != ERANGE);
+      expn = k + e;
+      MPFR_ASSERTN (expn >= e);
     }
-  else expn=k;
+  else
+    expn = k;
 
   endstr2 = str2;
   l = endstr2 - str0; /* length of mantissa */
-  if (l == 0) { /* input is zero */
-    MPFR_SET_ZERO(x);
-  }
-  else {
-    l = (l - 1) / BITS_PER_MP_LIMB + 1;
-    str2 = str0;
-
-    if (l > xsize) {
-      fprintf (stderr, "Error: mantissa larger than precision of destination variable in mpfr_set_str_raw\n");
-      exit (1);
+  if (l == 0)
+    { /* input is zero */
+      MPFR_SET_ZERO(x);
+    }
+  else
+    {
+      l = (l - 1) / BITS_PER_MP_LIMB + 1;
+      str2 = str0;
+
+      MPFR_ASSERTN (l <= xsize);
+
+      /* str2[0]..endstr2[-1] contains the mantissa */
+      for (k = 1; k <= l; k++)
+        {
+          j = 0;
+          xp[xsize - k] = 0;
+          while ((str2 < endstr2) && (j < BITS_PER_MP_LIMB))
+            {
+              xp[xsize - k] = (xp[xsize - k] << 1) + (*str2 - '0');
+              str2++; j++;
+            }
+          xp[xsize - k] <<= (BITS_PER_MP_LIMB - j);
+        }
+
+      for (; k <= xsize; k++)
+        xp[xsize - k] = 0;
+
+      count_leading_zeros(cnt, xp[xsize - 1]);
+      if (cnt)
+        mpn_lshift(xp, xp, xsize, cnt);
+
+      MPFR_SET_EXP (x, expn - cnt);
+      if (MPFR_ISNEG(x) != negative)
+        MPFR_CHANGE_SIGN(x);
     }
-
-    /* str2[0]..endstr2[-1] contains the mantissa */
-    for (k = 1; k <= l; k++)
-      {
-	j = 0; 
-	xp[xsize - k] = 0; 
-	while ((str2 < endstr2) && (j < BITS_PER_MP_LIMB))
-	  {
-	    xp[xsize - k] = (xp[xsize - k] << 1) + (*str2 - '0'); 
-	    str2++; j++; 
-	  }
-	xp[xsize - k] <<= (BITS_PER_MP_LIMB - j); 
-      }
-
-    for (; k <= xsize; k++)
-      xp[xsize - k] = 0;
-
-    count_leading_zeros(cnt, xp[xsize - 1]);
-    if (cnt)
-      mpn_lshift(xp, xp, xsize, cnt);
-
-    MPFR_SET_EXP (x, expn - cnt);
-    if (MPFR_ISNEG(x) != negative)
-      MPFR_CHANGE_SIGN(x);
-  }
 
   (*__gmp_free_func) (str0, alloc);
-  
-  /* May change to take into account : syntax errors, overflow in exponent, 
+
+  /* May change to take into account : syntax errors, overflow in exponent,
      string truncated because of size of x */
 }