[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.11-53-gd407525

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

The branch, stable-2.0 has been updated
       via  d40752513fff3306bed31e40721e627720b2f8ff (commit)
      from  f184e887a6cb09a97cf34feab30eeba4a28a3ae4 (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 d40752513fff3306bed31e40721e627720b2f8ff
Author: Andy Wingo <address@hidden>
Date:   Sat Jun 28 15:24:29 2014 +0200

    Fix bit-count* bug
    
    * libguile/bitvectors.c (scm_bit_count_star): Fix typo introduced in
      2005 refactor (!) in which the second arg was erroneously taken from
      the first arg.
    
    * test-suite/tests/bitvectors.test: Add test.
    
    * doc/ref/api-compound.texi: Fix doc example for u32vector selector.

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

Summary of changes:
 doc/ref/api-compound.texi        |    2 +-
 libguile/bitvectors.c            |    2 +-
 test-suite/tests/bitvectors.test |    4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ref/api-compound.texi b/doc/ref/api-compound.texi
index 055de99..8ec32d6 100644
--- a/doc/ref/api-compound.texi
+++ b/doc/ref/api-compound.texi
@@ -1142,7 +1142,7 @@ For example,
 
 @example
 (bit-count* #*01110111 #*11001101 #t) @result{} 3
-(bit-count* #*01110111 #u(7 0 4) #f)  @result{} 2
+(bit-count* #*01110111 #u32(7 0 4) #f)  @result{} 2
 @end example
 @end deffn
 
diff --git a/libguile/bitvectors.c b/libguile/bitvectors.c
index 0158490..af2e947 100644
--- a/libguile/bitvectors.c
+++ b/libguile/bitvectors.c
@@ -713,7 +713,7 @@ SCM_DEFINE (scm_bit_count_star, "bit-count*", 3, 0, 0,
       ssize_t kv_inc;
       const scm_t_uint32 *kv_bits;
       
-      kv_bits = scm_bitvector_elements (v, &kv_handle,
+      kv_bits = scm_bitvector_elements (kv, &kv_handle,
                                        &kv_off, &kv_len, &kv_inc);
 
       if (v_len != kv_len)
diff --git a/test-suite/tests/bitvectors.test b/test-suite/tests/bitvectors.test
index 8541576..d9dfa13 100644
--- a/test-suite/tests/bitvectors.test
+++ b/test-suite/tests/bitvectors.test
@@ -70,3 +70,7 @@
     (let ((v (bitvector #t #t #f #f)))
       (bit-set*! v #*101 #f)
       (equal? v #*0100))))
+
+(with-test-prefix "bit-count*"
+  (pass-if-equal 3 (bit-count* #*01110111 #*11001101 #t))
+  (pass-if-equal 2 (bit-count* #*01110111 #u32(7 0 4) #f)))


hooks/post-receive
-- 
GNU Guile