remove empty dir

[ghc-hetmet.git] / ghc / rts / gmp / mpz / inp_str.c

diff --git a/ghc/rts/gmp/mpz/inp_str.c b/ghc/rts/gmp/mpz/inp_str.c
index 7159062..7aa5e1f 100644 (file)
--- a/ghc/rts/gmp/mpz/inp_str.c
+++ b/ghc/rts/gmp/mpz/inp_str.c
@@ -1,21 +1,21 @@
 /* mpz_inp_str(dest_integer, stream, base) -- Input a number in base
    BASE from stdio stream STREAM and store the result in DEST_INTEGER.
 
-Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc.
+Copyright (C) 1991, 1993, 1994, 1996, 1998, 2000 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library.
 
 The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Library General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at your
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
 option) any later version.
 
 The GNU MP Library is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.
 
-You should have received a copy of the GNU Library General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with the GNU MP 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. */
@@ -26,9 +26,13 @@ MA 02111-1307, USA. */
 #include "gmp-impl.h"
 
 static int
+#if __STDC__
+digit_value_in_base (int c, int base)
+#else
 digit_value_in_base (c, base)
      int c;
      int base;
+#endif
 {
   int digit;
 
@@ -48,10 +52,10 @@ digit_value_in_base (c, base)
 
 size_t
 #if __STDC__
-mpz_inp_str (mpz_ptr dest, FILE *stream, int base)
+mpz_inp_str (mpz_ptr x, FILE *stream, int base)
 #else
-mpz_inp_str (dest, stream, base)
-     mpz_ptr dest;
+mpz_inp_str (x, stream, base)
+     mpz_ptr x;
      FILE *stream;
      int base;
 #endif
@@ -60,15 +64,12 @@ mpz_inp_str (dest, stream, base)
   size_t alloc_size, str_size;
   int c;
   int negative;
-  mp_size_t dest_size;
+  mp_size_t xsize;
   size_t nread;
 
   if (stream == 0)
     stream = stdin;
 
-  alloc_size = 100;
-  str = (char *) (*_mp_allocate_func) (alloc_size);
-  str_size = 0;
   nread = 0;
 
   /* Skip whitespace.  */
@@ -84,6 +85,7 @@ mpz_inp_str (dest, stream, base)
     {
       negative = 1;
       c = getc (stream);
+      nread++;
     }
 
   if (digit_value_in_base (c, base == 0 ? 10 : base) < 0)
@@ -105,9 +107,26 @@ mpz_inp_str (dest, stream, base)
              c = getc (stream);
              nread++;
            }
+         else if (c == 'b' || c == 'B')
+           {
+             base = 2;
+             c = getc (stream);
+             nread++;
+           }
        }
     }
 
+  /* Skip leading zeros.  */
+  while (c == '0')
+    {
+      c = getc (stream);
+      nread++;
+    }
+
+  alloc_size = 100;
+  str = (char *) (*_mp_allocate_func) (alloc_size);
+  str_size = 0;
+
   for (;;)
     {
       int dig;
@@ -126,12 +145,22 @@ mpz_inp_str (dest, stream, base)
 
   ungetc (c, stream);
 
-  dest_size = str_size / __mp_bases[base].chars_per_limb + 1;
-  if (dest->_mp_alloc < dest_size)
-    _mpz_realloc (dest, dest_size);
+  /* Make sure the string is not empty, mpn_set_str would fail.  */
+  if (str_size == 0)
+    {
+      x->_mp_size = 0;
+      (*_mp_free_func) (str, alloc_size);
+      return nread;
+    }
+
+  xsize = (((mp_size_t) (str_size / __mp_bases[base].chars_per_bit_exactly))
+          / BITS_PER_MP_LIMB + 2);
+  if (x->_mp_alloc < xsize)
+    _mpz_realloc (x, xsize);
 
-  dest_size = mpn_set_str (dest->_mp_d, (unsigned char *) str, str_size, base);
-  dest->_mp_size = negative ? -dest_size : dest_size;
+  /* Convert the byte array in base BASE to our bignum format.  */
+  xsize = mpn_set_str (x->_mp_d, (unsigned char *) str, str_size, base);
+  x->_mp_size = negative ? -xsize : xsize;
 
   (*_mp_free_func) (str, alloc_size);
   return str_size + nread;