summaryrefslogtreecommitdiff
path: root/test-suite/tests
diff options
context:
space:
mode:
Diffstat (limited to 'test-suite/tests')
-rw-r--r--test-suite/tests/arrays.test19
-rw-r--r--test-suite/tests/bitvectors.test19
-rw-r--r--test-suite/tests/ports.test4
-rw-r--r--test-suite/tests/srfi-4.test50
4 files changed, 42 insertions, 50 deletions
diff --git a/test-suite/tests/arrays.test b/test-suite/tests/arrays.test
index 0b3d57ca2..830af1433 100644
--- a/test-suite/tests/arrays.test
+++ b/test-suite/tests/arrays.test
@@ -1,6 +1,6 @@
;;;; unif.test --- tests guile's uniform arrays -*- scheme -*-
;;;;
-;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+;;;; Copyright 2004, 2006, 2009, 2010, 2011, 2012, 2013, 2014 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
@@ -33,13 +33,6 @@
(cons 'read-error ".*array length must be non-negative.*"))
-(with-test-prefix "sanity"
- ;; At the current time of writing, bignums have a tc7 that is one bit
- ;; away from strings. It used to be that the vector implementation
- ;; registered for strings had the TYP7S mask, not the TYP7 mask,
- ;; making the system think that bignums were vectors. Doh!
- (pass-if (not (uniform-vector? 12345678901234567890123456789))))
-
(with-test-prefix "array?"
(let ((bool (make-typed-array 'b #t '(5 6)))
@@ -574,10 +567,10 @@
(eqv? 8 (array-ref s2 2))))))
;;;
-;;; uniform-vector-ref
+;;; typed array-ref
;;;
-(with-test-prefix "uniform-vector-ref"
+(with-test-prefix "typed array-ref"
(with-test-prefix "byte"
@@ -586,15 +579,15 @@
(pass-if "0"
(begin
(array-set! a 0 0)
- (= 0 (uniform-vector-ref a 0))))
+ (= 0 (array-ref a 0))))
(pass-if "127"
(begin
(array-set! a 127 0)
- (= 127 (uniform-vector-ref a 0))))
+ (= 127 (array-ref a 0))))
(pass-if "-128"
(begin
(array-set! a -128 0)
- (= -128 (uniform-vector-ref a 0)))))))
+ (= -128 (array-ref a 0)))))))
;;;
;;; syntax
diff --git a/test-suite/tests/bitvectors.test b/test-suite/tests/bitvectors.test
index 4e32c619c..8541576aa 100644
--- a/test-suite/tests/bitvectors.test
+++ b/test-suite/tests/bitvectors.test
@@ -1,6 +1,6 @@
;;;; bitvectors.test --- tests guile's bitvectors -*- scheme -*-
;;;;
-;;;; Copyright 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;; Copyright 2010, 2011, 2013, 2014 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
@@ -22,8 +22,8 @@
(with-test-prefix "predicates"
(pass-if (bitvector? #*1010101010))
- (pass-if (uniform-vector? #*1010101010))
- (pass-if (array? #*1010101010)))
+ (pass-if (array? #*1010101010))
+ (pass-if (eq? (array-type #*1010101010) 'b)))
(with-test-prefix "equality"
@@ -36,23 +36,22 @@
(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"
+ (with-test-prefix "as bitvector"
(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"
+ (with-test-prefix "as array"
(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)))))
+ (pass-if (eqv? (array-ref bv 0) #f))
+ (pass-if (eqv? (array-ref bv 2) #t))
+ (array-set! bv #t 0)
+ (pass-if (eqv? (array-ref bv 0) #t)))))
(with-test-prefix "bit-set*!"
(pass-if "#t"
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index c2f4480f8..c1a185f17 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -243,7 +243,7 @@
(binary-test-string
(apply string
(map integer->char
- (uniform-vector->list
+ (array->list
(string->utf8 test-string))))))
(write-line test-string port)
(close-port port)
@@ -262,7 +262,7 @@
(binary-test-string
(apply string
(map integer->char
- (uniform-vector->list
+ (array->list
(string->utf8 test-string))))))
(write-line ";; coding: utf-8" port)
(write-line test-string port)
diff --git a/test-suite/tests/srfi-4.test b/test-suite/tests/srfi-4.test
index 9b76c7a4c..ffb185129 100644
--- a/test-suite/tests/srfi-4.test
+++ b/test-suite/tests/srfi-4.test
@@ -1,7 +1,7 @@
;;;; srfi-4.test --- Test suite for Guile's SRFI-4 functions. -*- scheme -*-
;;;; Martin Grabmueller, 2001-06-26
;;;;
-;;;; Copyright (C) 2001, 2006, 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;; Copyright (C) 2001, 2006, 2010, 2011, 2013, 2014 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
@@ -50,9 +50,9 @@
(equal? (u8vector->list (u8vector 1 2 3 4))
(u8vector->list (list->u8vector '(1 2 3 4)))))
- (pass-if "u8vector->list/uniform-vector->list"
+ (pass-if "u8vector->list/array->list"
(equal? (u8vector->list (u8vector 1 2 3 4))
- (uniform-vector->list (u8vector 1 2 3 4))))
+ (array->list (u8vector 1 2 3 4))))
(pass-if "make-u8vector"
(equal? (list->u8vector '(7 7 7 7))
@@ -87,9 +87,9 @@
(equal? (s8vector->list (s8vector 1 2 3 4))
(s8vector->list (list->s8vector '(1 2 3 4)))))
- (pass-if "s8vector->list/uniform-vector->list"
+ (pass-if "s8vector->list/array->list"
(equal? (s8vector->list (s8vector 1 2 3 4))
- (uniform-vector->list (s8vector 1 2 3 4))))
+ (array->list (s8vector 1 2 3 4))))
(pass-if "make-s8vector"
(equal? (list->s8vector '(7 7 7 7))
@@ -125,9 +125,9 @@
(equal? (u16vector->list (u16vector 1 2 3 4))
(u16vector->list (list->u16vector '(1 2 3 4)))))
- (pass-if "u16vector->list/uniform-vector->list"
+ (pass-if "u16vector->list/array->list"
(equal? (u16vector->list (u16vector 1 2 3 4))
- (uniform-vector->list (u16vector 1 2 3 4))))
+ (array->list (u16vector 1 2 3 4))))
(pass-if "make-u16vector"
(equal? (list->u16vector '(7 7 7 7))
@@ -162,9 +162,9 @@
(equal? (s16vector->list (s16vector 1 2 3 4))
(s16vector->list (list->s16vector '(1 2 3 4)))))
- (pass-if "s16vector->list/uniform-vector->list"
+ (pass-if "s16vector->list/array->list"
(equal? (s16vector->list (s16vector 1 2 3 4))
- (uniform-vector->list (s16vector 1 2 3 4))))
+ (array->list (s16vector 1 2 3 4))))
(pass-if "make-s16vector"
(equal? (list->s16vector '(7 7 7 7))
@@ -199,9 +199,9 @@
(equal? (u32vector->list (u32vector 1 2 3 4))
(u32vector->list (list->u32vector '(1 2 3 4)))))
- (pass-if "u32vector->list/uniform-vector->list"
+ (pass-if "u32vector->list/array->list"
(equal? (u32vector->list (u32vector 1 2 3 4))
- (uniform-vector->list (u32vector 1 2 3 4))))
+ (array->list (u32vector 1 2 3 4))))
(pass-if "make-u32vector"
(equal? (list->u32vector '(7 7 7 7))
@@ -236,9 +236,9 @@
(equal? (s32vector->list (s32vector 1 2 3 4))
(s32vector->list (list->s32vector '(1 2 3 4)))))
- (pass-if "s32vector->list/uniform-vector->list"
+ (pass-if "s32vector->list/array->list"
(equal? (s32vector->list (s32vector 1 2 3 4))
- (uniform-vector->list (s32vector 1 2 3 4))))
+ (array->list (s32vector 1 2 3 4))))
(pass-if "make-s32vector"
(equal? (list->s32vector '(7 7 7 7))
@@ -273,9 +273,9 @@
(equal? (u64vector->list (u64vector 1 2 3 4))
(u64vector->list (list->u64vector '(1 2 3 4)))))
- (pass-if "u64vector->list/uniform-vector->list"
+ (pass-if "u64vector->list/array->list"
(equal? (u64vector->list (u64vector 1 2 3 4))
- (uniform-vector->list (u64vector 1 2 3 4))))
+ (array->list (u64vector 1 2 3 4))))
(pass-if "make-u64vector"
(equal? (list->u64vector '(7 7 7 7))
@@ -310,9 +310,9 @@
(equal? (s64vector->list (s64vector 1 2 3 4))
(s64vector->list (list->s64vector '(1 2 3 4)))))
- (pass-if "s64vector->list/uniform-vector->list"
+ (pass-if "s64vector->list/array->list"
(equal? (s64vector->list (s64vector 1 2 3 4))
- (uniform-vector->list (s64vector 1 2 3 4))))
+ (array->list (s64vector 1 2 3 4))))
(pass-if "make-s64vector"
(equal? (list->s64vector '(7 7 7 7))
@@ -347,9 +347,9 @@
(equal? (f32vector->list (f32vector 1 2 3 4))
(f32vector->list (list->f32vector '(1 2 3 4)))))
- (pass-if "f32vector->list/uniform-vector->list"
+ (pass-if "f32vector->list/array->list"
(equal? (f32vector->list (f32vector 1 2 3 4))
- (uniform-vector->list (f32vector 1 2 3 4))))
+ (array->list (f32vector 1 2 3 4))))
(pass-if "make-f32vector"
(equal? (list->f32vector '(7 7 7 7))
@@ -387,9 +387,9 @@
(equal? (f64vector->list (f64vector 1 2 3 4))
(f64vector->list (list->f64vector '(1 2 3 4)))))
- (pass-if "f64vector->list/uniform-vector->list"
+ (pass-if "f64vector->list/array->list"
(equal? (f64vector->list (f64vector 1 2 3 4))
- (uniform-vector->list (f64vector 1 2 3 4))))
+ (array->list (f64vector 1 2 3 4))))
(pass-if "make-f64vector"
(equal? (list->f64vector '(7 7 7 7))
@@ -427,9 +427,9 @@
(equal? (c32vector->list (c32vector 1 2 3 4))
(c32vector->list (list->c32vector '(1 2 3 4)))))
- (pass-if "c32vector->list/uniform-vector->list"
+ (pass-if "c32vector->list/array->list"
(equal? (c32vector->list (c32vector 1 2 3 4))
- (uniform-vector->list (c32vector 1 2 3 4))))
+ (array->list (c32vector 1 2 3 4))))
(pass-if "make-c32vector"
(equal? (list->c32vector '(7 7 7 7))
@@ -486,9 +486,9 @@
(equal? (c64vector->list (c64vector 1 2 3 4))
(c64vector->list (list->c64vector '(1 2 3 4)))))
- (pass-if "c64vector->list/uniform-vector->list"
+ (pass-if "c64vector->list/array->list"
(equal? (c64vector->list (c64vector 1 2 3 4))
- (uniform-vector->list (c64vector 1 2 3 4))))
+ (array->list (c64vector 1 2 3 4))))
(pass-if "make-c64vector"
(equal? (list->c64vector '(7 7 7 7))