mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 19:50:24 +02:00
bitvector work
* test-suite/Makefile.am: * test-suite/tests/bitvectors.test: Add a new file to test bitvectors. * libguile/uniform.c (scm_c_uniform_vector_length): Don't call scm_uniform_vector_elements, as we don't need to be able to access the elements with pointers to bytes. Fixes uniform-vector-length on bitvectors.
This commit is contained in:
parent
44d65b23ce
commit
0142d376b8
3 changed files with 66 additions and 8 deletions
|
@ -1,4 +1,4 @@
|
||||||
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009 Free Software Foundation, Inc.
|
/* Copyright (C) 1995,1996,1997,1998,2000,2001,2002,2003,2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU Lesser General Public License
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
@ -99,13 +99,11 @@ scm_is_uniform_vector (SCM obj)
|
||||||
size_t
|
size_t
|
||||||
scm_c_uniform_vector_length (SCM uvec)
|
scm_c_uniform_vector_length (SCM uvec)
|
||||||
{
|
{
|
||||||
scm_t_array_handle h;
|
if (!scm_is_uniform_vector (uvec))
|
||||||
size_t len;
|
scm_wrong_type_arg_msg ("uniform-vector-length", 1, uvec,
|
||||||
ssize_t inc;
|
"uniform vector");
|
||||||
|
|
||||||
scm_uniform_vector_elements (uvec, &h, &len, &inc);
|
return scm_c_generalized_vector_length (uvec);
|
||||||
scm_array_handle_release (&h);
|
|
||||||
return len;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0, 0,
|
SCM_DEFINE (scm_uniform_vector_p, "uniform-vector?", 1, 0, 0,
|
||||||
|
|
|
@ -28,6 +28,7 @@ SCM_TESTS = tests/00-initial-env.test \
|
||||||
tests/arrays.test \
|
tests/arrays.test \
|
||||||
tests/asm-to-bytecode.test \
|
tests/asm-to-bytecode.test \
|
||||||
tests/bit-operations.test \
|
tests/bit-operations.test \
|
||||||
|
tests/bitvectors.test \
|
||||||
tests/brainfuck.test \
|
tests/brainfuck.test \
|
||||||
tests/bytevectors.test \
|
tests/bytevectors.test \
|
||||||
tests/c-api.test \
|
tests/c-api.test \
|
||||||
|
|
59
test-suite/tests/bitvectors.test
Normal file
59
test-suite/tests/bitvectors.test
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
;;;; bitvectors.test --- tests guile's bitvectors -*- scheme -*-
|
||||||
|
;;;;
|
||||||
|
;;;; Copyright 2010 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 the License, or (at your option) any later version.
|
||||||
|
;;;;
|
||||||
|
;;;; This library 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
|
||||||
|
;;;; Lesser General Public License for more details.
|
||||||
|
;;;;
|
||||||
|
;;;; You should have received a copy of the GNU Lesser General Public
|
||||||
|
;;;; License along with this library; if not, write to the Free Software
|
||||||
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
|
(define-module (test-suite test-bitvectors)
|
||||||
|
#:use-module (test-suite lib))
|
||||||
|
|
||||||
|
|
||||||
|
(with-test-prefix "predicates"
|
||||||
|
(pass-if (bitvector? #*1010101010))
|
||||||
|
(pass-if (generalized-vector? #*1010101010))
|
||||||
|
(pass-if (uniform-vector? #*1010101010))
|
||||||
|
(pass-if (array? #*1010101010)))
|
||||||
|
|
||||||
|
|
||||||
|
(with-test-prefix "equality"
|
||||||
|
(pass-if (equal? #*1010101 #*1010101))
|
||||||
|
(pass-if (array-equal? #*1010101 #*1010101))
|
||||||
|
|
||||||
|
(pass-if (not (equal? #*10101010 #*1010101)))
|
||||||
|
(pass-if (not (array-equal? #*10101010 #*1010101))))
|
||||||
|
|
||||||
|
(with-test-prefix "lists"
|
||||||
|
(pass-if (equal? (bitvector->list #*10010) '(#t #f #f #t #f)))
|
||||||
|
(pass-if (equal? (array->list #*10010) '(#t #f #f #t #f)))
|
||||||
|
(pass-if (equal? (uniform-vector->list #*10010) '(#t #f #f #t #f)))
|
||||||
|
(pass-if (equal? #*10010 (list->bitvector '(#t #f #f #t #f)))))
|
||||||
|
|
||||||
|
(with-test-prefix "ref and set"
|
||||||
|
(with-test-prefix "bv"
|
||||||
|
(let ((bv (list->bitvector '(#f #f #t #f #t))))
|
||||||
|
(pass-if (eqv? (bitvector-ref bv 0) #f))
|
||||||
|
(pass-if (eqv? (bitvector-ref bv 2) #t))
|
||||||
|
(bitvector-set! bv 0 #t)
|
||||||
|
(pass-if (eqv? (bitvector-ref bv 0) #t))))
|
||||||
|
|
||||||
|
(with-test-prefix "uv"
|
||||||
|
(let ((bv (list->bitvector '(#f #f #t #f #t))))
|
||||||
|
(pass-if (eqv? (uniform-vector-ref bv 0) #f))
|
||||||
|
(pass-if (eqv? (uniform-vector-ref bv 2) #t))
|
||||||
|
(uniform-vector-set! bv 0 #t)
|
||||||
|
(pass-if (eqv? (uniform-vector-ref bv 0) #t)))))
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue