[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.7-251-g8d6e3dd

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=8d6e3dd83a09f35a18774baa696ba443aa379cbb

The branch, stable-2.0 has been updated
       via  8d6e3dd83a09f35a18774baa696ba443aa379cbb (commit)
       via  07b390d5827da2f46f57e4650167920fb792ebc9 (commit)
       via  06589f5c229c3ce4dd2cb627c90ef4372dd0a571 (commit)
       via  4a0821a8d5cfff50fef8c119a0d76355b6126009 (commit)
      from  10d278fde5dcd8033fe1209657aa58ce792b9b83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8d6e3dd83a09f35a18774baa696ba443aa379cbb
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 22:16:24 2013 +0100

    Add Gnulib commit ID in `NEWS'.

commit 07b390d5827da2f46f57e4650167920fb792ebc9
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 22:16:07 2013 +0100

    Allow compilation with GMP < 5.0.0.
    
    * libguile/numbers.c (VARARG_MPZ_ITERATOR)[!HAVE_DECL_MPZ_INITS]: New
      macro.
      (mpz_inits, mpz_clears)[!HAVE_DECL_MPZ_INITS]: New functions.
    * configure.ac: Check for the declaration of `mpz_inits'.

commit 06589f5c229c3ce4dd2cb627c90ef4372dd0a571
Author: Ludovic Courtès <address@hidden>
Date:   Thu Mar 28 21:01:51 2013 +0100

    Fix erroneous `FUNC_NAME' for `scm_array_length'.
    
    * libguile/generalized-arrays.c (scm_array_length): Fix `FUNC_NAME'.

commit 4a0821a8d5cfff50fef8c119a0d76355b6126009
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 27 22:32:46 2013 +0100

    doc: Consider `stream-null' as a variable.
    
    * doc/ref/srfi-modules.texi (SRFI-41): Use @var{stream-null}, not
      @code{stream-null}.  Use @defvr to introduce `stream-null'.

-----------------------------------------------------------------------

Summary of changes:
 NEWS                          |    6 +++---
 configure.ac                  |    8 ++++++++
 doc/ref/srfi-modules.texi     |   12 ++++++------
 libguile/generalized-arrays.c |    2 +-
 libguile/numbers.c            |   31 ++++++++++++++++++++++++++++++-
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 80b06fd..dbabdd3 100644
--- a/NEWS
+++ b/NEWS
@@ -49,9 +49,9 @@ removed on those plaforms (basically only MinGW).
 
 ** Gnulib update.
 
-Guile's copy of Gnulib was updated to XXX.  The following modules were
-imported from Gnulib: select, times, pipe-posix, fstat, getlogin, and
-poll.
+Guile's copy of Gnulib was updated to v0.0-7865-ga828bb2.  The following
+modules were imported from Gnulib: select, times, pipe-posix, fstat,
+getlogin, and poll.
 
 ** New optimizations.
 
diff --git a/configure.ac b/configure.ac
index bcfc1a6..41a5577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -872,6 +872,14 @@ if test "x$HAVE_LIBGMP" != "xyes"; then
   AC_MSG_ERROR([GNU MP 4.1 or greater not found, see README])
 fi
 
+dnl `mpz_inits' and `mpz_clears' appeared in GMP 5.0.0.
+save_CPPFLAGS="$CPPFLAGS"
+if test "x$LIBGMP_PREFIX" != "x"; then
+   CPPFLAGS="-I$LIBGMP_PREFIX $CPPFLAGS"
+fi
+AC_CHECK_DECLS([mpz_inits], [], [], [[#include <gmp.h>]])
+CPPFLAGS="$save_CPPFLAGS"
+
 dnl GNU libunistring is checked for by Gnulib's `libunistring' module.
 if test "x$LTLIBUNISTRING" = "x"; then
   AC_MSG_ERROR([GNU libunistring is required, please install it.])
diff --git a/doc/ref/srfi-modules.texi b/doc/ref/srfi-modules.texi
index 1fc6098..653cb05 100644
--- a/doc/ref/srfi-modules.texi
+++ b/doc/ref/srfi-modules.texi
@@ -3844,7 +3844,7 @@ again.  SRFI-41 can be made available with:
 
 SRFI-41 Streams are based on two mutually-recursive abstract data types:
 An object of the @code{stream} abstract data type is a promise that,
-when forced, is either @code{stream-null} or is an object of type
+when forced, is either @var{stream-null} or is an object of type
 @code{stream-pair}.  An object of the @code{stream-pair} abstract data
 type contains a @code{stream-car} and a @code{stream-cdr}, which must be
 a @code{stream}.  The essential feature of streams is the systematic
@@ -3862,16 +3862,16 @@ stream, and is only forced on demand.
 @subsubsection SRFI-41 Stream Primitives
 
 This library provides eight operators: constructors for
address@hidden and @code{stream-pair}s, type predicates for streams
address@hidden and @code{stream-pair}s, type predicates for streams
 and the two kinds of streams, accessors for both fields of a
 @code{stream-pair}, and a lambda that creates procedures that return
 streams.
 
address@hidden {Scheme Variable} stream-null
address@hidden {Scheme Variable} stream-null
 A promise that, when forced, is a single object, distinguishable from
-all other objects, that represents the null stream.  @code{stream-null}
+all other objects, that represents the null stream.  @var{stream-null}
 is immutable and unique.
address@hidden deffn
address@hidden defvr
 
 @deffn {Scheme Syntax} stream-cons object-expr stream-expr
 Creates a newly-allocated stream containing a promise that, when forced,
@@ -4003,7 +4003,7 @@ Returns a newly-allocated stream containing the elements 
from
 Returns a newly-allocated stream containing in its elements the
 characters on the port.  If @var{port} is not given it defaults to the
 current input port.  The returned stream has finite length and is
-terminated by @code{stream-null}.
+terminated by @var{stream-null}.
 
 It looks like one use of @code{port->stream} would be this:
 
diff --git a/libguile/generalized-arrays.c b/libguile/generalized-arrays.c
index 9382e81..59925a0 100644
--- a/libguile/generalized-arrays.c
+++ b/libguile/generalized-arrays.c
@@ -135,7 +135,7 @@ SCM_DEFINE (scm_array_length, "array-length", 1, 0, 0,
            (SCM array),
            "Return the length of an array: its first dimension.\n"
             "It is an error to ask for the length of an array of rank 0.")
-#define FUNC_NAME s_scm_array_rank
+#define FUNC_NAME s_scm_array_length
 {
   return scm_from_size_t (scm_c_array_length (array));
 }
diff --git a/libguile/numbers.c b/libguile/numbers.c
index a7c0928..1f4b9a8 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 
2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ *   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
+ *   2013 Free Software Foundation, Inc.
  *
  * Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
  * and Bellcore.  See scm_divide.
@@ -56,6 +58,8 @@
 #include <complex.h>
 #endif
 
+#include <stdarg.h>
+
 #include "libguile/_scm.h"
 #include "libguile/feature.h"
 #include "libguile/ports.h"
@@ -96,6 +100,31 @@ typedef scm_t_signed_bits scm_t_inum;
 #define DOUBLE_IS_POSITIVE_INFINITY(x) (isinf(x) && ((x) > 0))
 #define DOUBLE_IS_NEGATIVE_INFINITY(x) (isinf(x) && ((x) < 0))
 
+
+#if ! HAVE_DECL_MPZ_INITS
+
+/* GMP < 5.0.0 lacks `mpz_inits' and `mpz_clears'.  Provide them.  */
+
+#define VARARG_MPZ_ITERATOR(func)              \
+  static void                                  \
+  func ## s (mpz_t x, ...)                     \
+  {                                            \
+    va_list  ap;                               \
+                                               \
+    va_start (ap, x);                          \
+    while (x != NULL)                          \
+      {                                                \
+       func (x);                               \
+       x = va_arg (ap, mpz_ptr);               \
+      }                                                \
+    va_end (ap);                               \
+  }
+
+VARARG_MPZ_ITERATOR (mpz_init)
+VARARG_MPZ_ITERATOR (mpz_clear)
+
+#endif
+
 
 
 /*


hooks/post-receive
-- 
GNU Guile