[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-102-gfd07759

[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=fd07759b7d4c9d631090b04855ab81b6a2109e9e

The branch, stable-2.0 has been updated
       via  fd07759b7d4c9d631090b04855ab81b6a2109e9e (commit)
       via  d8fe367a31d15ea64c43c80c4e4819ef393696ef (commit)
      from  0f6dd25023da59bcfefb080c66a2d2650d955ffa (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 fd07759b7d4c9d631090b04855ab81b6a2109e9e
Author: Ludovic Courtès <address@hidden>
Date:   Sat Apr 21 23:08:49 2012 +0200

    Fix and clarify documentation of `sorted?'.
    
    Fixed <http://bugs.gnu.org/11262>.
    Reported by Alexei Matveev <address@hidden>.
    
    * libguile/sort.c (scm_sorted_p): Fix and clarify docstring.
    * doc/ref/api-utility.texi (Sorting): Update accordingly.

commit d8fe367a31d15ea64c43c80c4e4819ef393696ef
Author: Ludovic Courtès <address@hidden>
Date:   Sat Apr 21 23:08:49 2012 +0200

    Remove duplicate test in `tree-il.test'.
    
    * test-suite/tests/tree-il.test ("partial evaluation"): Remove duplicate
      test for `(cons 0 (cons 1 (cons 2 (list 3 4 5))))'.

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

Summary of changes:
 doc/ref/api-utility.texi      |    9 +++++----
 libguile/sort.c               |   11 +++++++----
 test-suite/tests/tree-il.test |    7 -------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi
index 9ab1eee..17694ec 100644
--- a/doc/ref/api-utility.texi
+++ b/doc/ref/api-utility.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2011
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2011, 
2012
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -308,9 +308,10 @@ input.
 
 @deffn {Scheme Procedure} sorted? items less
 @deffnx {C Function} scm_sorted_p (items, less)
-Return @code{#t} iff @var{items} is a list or a vector such that
-for all 1 <= i <= m, the predicate @var{less} returns true when
-applied to all elements i - 1 and i
+Return @code{#t} iff @var{items} is a list or vector such that,
+for each element @var{x} and the next element @var{y} of
address@hidden, @code{(@var{less} @var{y} @var{x})} returns
address@hidden
 @end deffn
 
 @deffn {Scheme Procedure} sort items less
diff --git a/libguile/sort.c b/libguile/sort.c
index ecadd82..2a36320 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011 
Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2008, 2009,
+ *   2010, 2011, 2012 Free Software Foundation, Inc.
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; either version 3 of
@@ -101,9 +103,10 @@ SCM_DEFINE (scm_restricted_vector_sort_x, 
"restricted-vector-sort!", 4, 0, 0,
  * (not (less? (list-ref list i) (list-ref list (- i 1)))). */
 SCM_DEFINE (scm_sorted_p, "sorted?", 2, 0, 0,
             (SCM items, SCM less),
-           "Return @code{#t} iff @var{items} is a list or a vector such that\n"
-           "for all 1 <= i <= m, the predicate @var{less} returns true when\n"
-           "applied to all elements i - 1 and i")
+           "Return @code{#t} iff @var{items} is a list or vector such that, "
+           "for each element @var{x} and the next element @var{y} of "
+           "@var{items}, @code{(@var{less} @var{y} @var{x})} returns "
+           "@code{#f}.")
 #define FUNC_NAME s_scm_sorted_p
 {
   long len, j;                 /* list/vector length, temp j */
diff --git a/test-suite/tests/tree-il.test b/test-suite/tests/tree-il.test
index 0be5636..0f0e553 100644
--- a/test-suite/tests/tree-il.test
+++ b/test-suite/tests/tree-il.test
@@ -705,13 +705,6 @@
            (const 0) (const 1) (const 2) (const 3) (const 4) (const 5)))
 
   (pass-if-peval
-   ;; First order, coalesced, mutability preserved.
-   (cons 0 (cons 1 (cons 2 (list 3 4 5))))
-   ;; This must not be a constant.
-   (apply (primitive list)
-          (const 0) (const 1) (const 2) (const 3) (const 4) (const 5)))
-
-  (pass-if-peval
     ;; First order, coalesced, immutability preserved.
     (cons 0 (cons 1 (cons 2 '(3 4 5))))
     (apply (primitive cons) (const 0)


hooks/post-receive
-- 
GNU Guile