intprops: new macro INT_BITS_STRLEN_BOUND

* lib/intprops.h (INT_BITS_STRLEN_BOUND): New macro, needed by
ftoastr.h.  This exposes an internal of intprops.h that was formerly
not exposed.  Also, it uses a slightly tighter bound than before;
though this makes no practical difference, we might as well be as
tight as we easily can.

diff --git a/ChangeLog b/ChangeLog
index ea0610ab7943b4920a90d30286cb00ab0e4bf241..0ab0af34bf441c60a489de1d62c39134efb5e25a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+       intprops: new macro INT_BITS_STRLEN_BOUND
+       * lib/intprops.h (INT_BITS_STRLEN_BOUND): New macro, needed by
+       ftoastr.h.  This exposes an internal of intprops.h that was formerly
+       not exposed.  Also, it uses a slightly tighter bound than before;
+       though this makes no practical difference, we might as well be as
+       tight as we easily can.
+
        ftoastr: new module, for lossless conversion of floats to short strings
        * lib/ftoastr.h, lib/ftoastr.c, lib/dtoastr.c, lib/ldtoastr.c:
        * modules/ftoastr: New files.

diff --git a/lib/intprops.h b/lib/intprops.h
index 46f4d47d709c7018fe5fe2e203e990416bce0f3a..0c2787582f3a2e820ee47577e471f35cd7c76308 100644 (file)
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -68,13 +68,17 @@
 #  define signed_type_or_expr__(t) 1
 # endif
 
+/* Bound on length of the string representing an unsigned integer
+   value representable in B bits.  log10 (2.0) < 146/485.  The
+   smallest value of B where this bound is not tight is 2621.  */
+# define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
+
 /* Bound on length of the string representing an integer type or expression T.
-   Subtract 1 for the sign bit if T is signed; log10 (2.0) < 146/485;
-   add 1 for integer division truncation; add 1 more for a minus sign
-   if needed.  */
+   Subtract 1 for the sign bit if T is signed, and then add 1 more for
+   a minus sign if needed.  */
 # define INT_STRLEN_BOUND(t) \
-  ((sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) * 146 / 485 \
-   + signed_type_or_expr__ (t) + 1)
+  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT - signed_type_or_expr__ (t)) \
+   + signed_type_or_expr__ (t))
 
 /* Bound on buffer size needed to represent an integer type or expression T,
    including the terminating null.  */