bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

new module 'ceilf'


From: Bruno Haible
Subject: new module 'ceilf'
Date: Fri, 5 Oct 2007 03:43:28 +0200
User-agent: KMail/1.5.4

Slowly, you know what to expect...

2007-10-04  Bruno Haible  <address@hidden>

        * modules/ceilf: New file.
        * lib/ceil.c: New file.
        * lib/ceilf.c: New file.
        * m4/ceilf.m4: New file.
        * lib/math.in.h (ceilf): New declaration.
        * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Initialize GNULIB_CEILF and
        HAVE_DECL_CEILF.
        * modules/math (Makefile.am): Substitute also GNULIB_CEILF and
        HAVE_DECL_CEILF.
        * doc/functions/ceilf.texi: Mention the 'ceilf' module.

*** doc/functions/ceilf.texi.orig       2007-10-05 03:42:18.000000000 +0200
--- doc/functions/ceilf.texi    2007-10-05 02:42:52.000000000 +0200
***************
*** 4,18 ****
  
  POSIX specification: @url{http://www.opengroup.org/susv3xsh/ceilf.html}
  
! Gnulib module: ---
  
  Portability problems fixed by Gnulib:
  @itemize
  @end itemize
  
  Portability problems not fixed by Gnulib:
  @itemize
- @item
- This function is missing on some platforms:
- AIX 5.1, HP-UX 11, Solaris 9.
  @end itemize
--- 4,18 ----
  
  POSIX specification: @url{http://www.opengroup.org/susv3xsh/ceilf.html}
  
! Gnulib module: ceilf
  
  Portability problems fixed by Gnulib:
  @itemize
+ @item
+ This function is missing on some platforms:
+ AIX 5.1, HP-UX 11, Solaris 9.
  @end itemize
  
  Portability problems not fixed by Gnulib:
  @itemize
  @end itemize
Changing permissions from . to 100644
*** lib/ceil.c.orig     2003-09-23 19:59:22.000000000 +0200
--- lib/ceil.c  2007-10-05 02:56:36.000000000 +0200
***************
*** 0 ****
--- 1,83 ----
+ /* Round towards positive infinity.
+    Copyright (C) 2007 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program 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 General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
+ /* Written by Bruno Haible <address@hidden>, 2007.  */
+ 
+ #include <config.h>
+ 
+ /* Specification.  */
+ #include <math.h>
+ 
+ #include <float.h>
+ 
+ #ifdef USE_LONG_DOUBLE
+ # define FUNC ceill
+ # define DOUBLE long double
+ # define MANT_DIG LDBL_MANT_DIG
+ # define L_(literal) literal##L
+ #elif ! defined USE_FLOAT
+ # define FUNC ceil
+ # define DOUBLE double
+ # define MANT_DIG DBL_MANT_DIG
+ # define L_(literal) literal
+ #else /* defined USE_FLOAT */
+ # define FUNC ceilf
+ # define DOUBLE float
+ # define MANT_DIG FLT_MANT_DIG
+ # define L_(literal) literal##f
+ #endif
+ 
+ /* 2^(MANT_DIG-1).  */
+ static const double TWO_MANT_DIG =
+   /* Assume MANT_DIG <= 5 * 31.
+      Use the identity
+        n = floor(n/5) + floor((n+1)/5) + ... + floor((n+4)/5).  */
+   (DOUBLE) (1U << ((MANT_DIG - 1) / 5))
+   * (DOUBLE) (1U << ((MANT_DIG - 1 + 1) / 5))
+   * (DOUBLE) (1U << ((MANT_DIG - 1 + 2) / 5))
+   * (DOUBLE) (1U << ((MANT_DIG - 1 + 3) / 5))
+   * (DOUBLE) (1U << ((MANT_DIG - 1 + 4) / 5));
+ 
+ DOUBLE
+ FUNC (DOUBLE x)
+ {
+   /* The use of 'volatile' guarantees that excess precision bits are dropped
+      at each addition step and before the following comparison at the caller's
+      site.  It is necessary on x86 systems where double-floats are not IEEE
+      compliant by default, to avoid that the results become platform and 
compiler
+      option dependent.  'volatile' is a portable alternative to gcc's
+      -ffloat-store option.  */
+   volatile DOUBLE y = x;
+   volatile DOUBLE z = y;
+ 
+   /* Round to the next integer (nearest or up or down, doesn't matter).  */
+   if (z > L_(0.0))
+     {
+       z += TWO_MANT_DIG;
+       z -= TWO_MANT_DIG;
+     }
+   else if (z < L_(0.0))
+     {
+       z -= TWO_MANT_DIG;
+       z += TWO_MANT_DIG;
+     }
+   /* Enforce rounding up.  */
+   if (z < y)
+     z += L_(1.0);
+ 
+   return z;
+ }
Changing permissions from . to 100644
*** lib/ceilf.c.orig    2003-09-23 19:59:22.000000000 +0200
--- lib/ceilf.c 2007-10-05 02:37:45.000000000 +0200
***************
*** 0 ****
--- 1,21 ----
+ /* Round towards positive infinity.
+    Copyright (C) 2007 Free Software Foundation, Inc.
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program 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 General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+ 
+ /* Written by Bruno Haible <address@hidden>, 2007.  */
+ 
+ #define USE_FLOAT
+ #include "ceil.c"
*** lib/math.in.h.orig  2007-10-05 03:42:18.000000000 +0200
--- lib/math.in.h       2007-10-05 03:37:28.000000000 +0200
***************
*** 90,95 ****
--- 90,108 ----
  #endif
  
  
+ #if @GNULIB_CEILF@
+ # if address@hidden@
+ #  define ceilf rpl_ceilf
+ extern float ceilf (float x);
+ # endif
+ #elif defined GNULIB_POSIXCHECK
+ # undef ceilf
+ # define ceilf(x) \
+     (GL_LINK_WARNING ("ceilf is unportable - " \
+                       "use gnulib module ceilf for portability"), \
+      ceilf (x))
+ #endif
+ 
  #if @GNULIB_MATHL@ || address@hidden@
  extern long double ceill (long double x);
  #endif
Changing permissions from . to 100644
*** m4/ceilf.m4.orig    2003-09-23 19:59:22.000000000 +0200
--- m4/ceilf.m4 2007-10-05 03:41:32.000000000 +0200
***************
*** 0 ****
--- 1,48 ----
+ # ceilf.m4 serial 1
+ dnl Copyright (C) 2007 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ 
+ AC_DEFUN([gl_FUNC_CEILF],
+ [
+   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+   dnl Persuade glibc <math.h> to declare ceilf().
+   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+   dnl Test whether ceilf() is declared.
+   AC_CHECK_DECLS([ceilf], , , [#include <math.h>])
+   if test "$ac_cv_have_decl_ceilf" = yes; then
+     dnl Test whether ceilf() can be used without libm.
+     CEILF_LIBM=?
+     AC_TRY_LINK([
+        #ifndef __NO_MATH_INLINES
+        # define __NO_MATH_INLINES 1 /* for glibc */
+        #endif
+        #include <math.h>
+        float x;],
+       [x = ceilf(x);],
+       [CEILF_LIBM=])
+     if test "$CEILF_LIBM" = "?"; then
+       save_LIBS="$LIBS"
+       LIBS="$LIBS -lm"
+       AC_TRY_LINK([
+          #ifndef __NO_MATH_INLINES
+          # define __NO_MATH_INLINES 1 /* for glibc */
+          #endif
+          #include <math.h>
+          float x;],
+         [x = ceilf(x);],
+         [CEILF_LIBM="-lm"])
+       LIBS="$save_LIBS"
+     fi
+     if test "$CEILF_LIBM" = "?"; then
+       CEILF_LIBM=
+     fi
+   else
+     HAVE_DECL_CEILF=0
+     AC_LIBOBJ([ceilf])
+     CEILF_LIBM=
+   fi
+   AC_SUBST([HAVE_DECL_CEILF])
+   AC_SUBST([CEILF_LIBM])
+ ])
*** m4/math_h.m4.orig   2007-10-05 03:42:18.000000000 +0200
--- m4/math_h.m4        2007-10-05 03:36:35.000000000 +0200
***************
*** 19,24 ****
--- 19,25 ----
  
  AC_DEFUN([gl_MATH_H_DEFAULTS],
  [
+   GNULIB_CEILF=0;   AC_SUBST([GNULIB_CEILF])
    GNULIB_FLOORF=0;  AC_SUBST([GNULIB_FLOORF])
    GNULIB_FLOORL=0;  AC_SUBST([GNULIB_FLOORL])
    GNULIB_FREXP=0;   AC_SUBST([GNULIB_FREXP])
***************
*** 33,38 ****
--- 34,40 ----
    HAVE_DECL_ACOSL=1;  AC_SUBST([HAVE_DECL_ACOSL])
    HAVE_DECL_ASINL=1;  AC_SUBST([HAVE_DECL_ASINL])
    HAVE_DECL_ATANL=1;  AC_SUBST([HAVE_DECL_ATANL])
+   HAVE_DECL_CEILF=1;  AC_SUBST([HAVE_DECL_CEILF])
    HAVE_DECL_CEILL=1;  AC_SUBST([HAVE_DECL_CEILL])
    HAVE_DECL_COSL=1;   AC_SUBST([HAVE_DECL_COSL])
    HAVE_DECL_EXPL=1;   AC_SUBST([HAVE_DECL_EXPL])
Changing permissions from . to 100644
*** modules/ceilf.orig  2003-09-23 19:59:22.000000000 +0200
--- modules/ceilf       2007-10-05 02:33:47.000000000 +0200
***************
*** 0 ****
--- 1,31 ----
+ Description:
+ ceilf() function: round towards positive infinity.
+ 
+ Files:
+ lib/ceilf.c
+ lib/ceil.c
+ m4/ceilf.m4
+ 
+ Depends-on:
+ math
+ extensions
+ float
+ 
+ configure.ac:
+ gl_FUNC_CEILF
+ gl_MATH_MODULE_INDICATOR([ceilf])
+ 
+ Makefile.am:
+ 
+ Include:
+ <math.h>
+ 
+ Link:
+ $(CEILF_LIBM)
+ 
+ License:
+ LGPL
+ 
+ Maintainer:
+ Bruno Haible
+ 
*** modules/math.orig   2007-10-05 03:42:18.000000000 +0200
--- modules/math        2007-10-05 03:36:11.000000000 +0200
***************
*** 22,27 ****
--- 22,28 ----
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
              -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \
+             -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
              -e 's|@''GNULIB_FLOORF''@|$(GNULIB_FLOORF)|g' \
              -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \
              -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
***************
*** 35,40 ****
--- 36,42 ----
              -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
              -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
              -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
+             -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \
              -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \
              -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \
              -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \





reply via email to

[Prev in Thread] Current Thread [Next in Thread]