GOOPS cosmetics

[bpt/guile.git] / test-suite / tests / srfi-60.test

diff --git a/test-suite/tests/srfi-60.test b/test-suite/tests/srfi-60.test
index 1ef9511..1c91943 100644 (file)
--- a/test-suite/tests/srfi-60.test
+++ b/test-suite/tests/srfi-60.test
@@ -1,23 +1,23 @@
 ;;;; srfi-60.test --- Test suite for Guile's SRFI-60 functions. -*- scheme -*-
 ;;;;
-;;;; Copyright 2005 Free Software Foundation, Inc.
+;;;; Copyright 2005, 2006 Free Software Foundation, Inc.
 ;;;;
-;;;; This program is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
-;;;;
-;;;; This program is distributed in the hope that it will be useful,
+;;;; 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 General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; 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-srfi-60)
+  #:duplicates (last)  ;; avoid warning about srfi-60 replacing `bit-count'
   #:use-module (test-suite lib)
   #:use-module (srfi srfi-60))
 
@@ -268,27 +268,74 @@
 ;;
 
 (with-test-prefix "rotate-bit-field"
-  (pass-if (eqv? #b110  (rotate-bit-field #b110 1 1 2)))
-  (pass-if (eqv? #b1010 (rotate-bit-field #b110 1 2 4)))
-  (pass-if (eqv? #b1011 (rotate-bit-field #b0111 -1 1 4)))
-
-  (pass-if (eqv? #b0  (rotate-bit-field #b0 128 0 256)))
-  (pass-if (eqv? #b1  (rotate-bit-field #b1 128 1 256)))
-  (pass-if
-      (eqv? #x100000000000000000000000000000000
-           (rotate-bit-field #x100000000000000000000000000000000 128 0 64)))
-  (pass-if
-      (eqv? #x100000000000000000000000000000008
-           (rotate-bit-field #x100000000000000000000000000000001 3 0 64)))
-  (pass-if
-      (eqv? #x100000000000000002000000000000000
-           (rotate-bit-field #x100000000000000000000000000000001 -3 0 64)))
-
-  (pass-if (eqv? #b110 (rotate-bit-field #b110 0 0 10)))
-  (pass-if (eqv? #b110 (rotate-bit-field #b110 0 0 256)))
-
-  (pass-if "bignum becomes inum"
-    (eqv? 1 (rotate-bit-field #x100000000000000000000000000000000 1 0 129))))
+  (define-syntax-rule (check expected x count start end)
+    (begin
+      (pass-if-equal expected (rotate-bit-field x count start end))
+      (pass-if-equal (lognot expected)
+          (rotate-bit-field (lognot x) count start end))))
+
+  (check #b110  #b110 1 1 2)
+  (check #b1010 #b110 1 2 4)
+  (check #b1011 #b0111 -1 1 4)
+
+  (check #b0 #b0 128 0 256)
+  (check #b1 #b1 128 1 256)
+  (check #x100000000000000000000000000000000
+         #x100000000000000000000000000000000 128 0 64)
+  (check #x100000000000000000000000000000008
+         #x100000000000000000000000000000001 3 0 64)
+  (check #x100000000000000002000000000000000
+         #x100000000000000000000000000000001 -3 0 64)
+
+  (check #b110 #b110 0 0 10)
+  (check #b110 #b110 0 0 256)
+
+  (check #b110  #b110 1 1 1)
+
+  (check #b10111010001100111101110010101
+         #b11010001100111101110001110101 -26 5 28)
+  (check #b11000110011110111000111011001
+         #b11010001100111101110001110101 28 2 28)
+
+  (check #b01111010001100111101110010101
+         #b11010001100111101110001110101 -3 5 29)
+  (check #b10100011001111011100011101101
+         #b11010001100111101110001110101 28 2 29)
+
+  (check #b110110100011001111011100010101
+         #b011010001100111101110001110101 48 5 30)
+  (check #b110100011001111011100011101001
+         #b011010001100111101110001110101 85 2 30)
+  (check #b011010001100111101110001110101
+         #b110100011001111011100011101001 83 2 30)
+
+  (check
+   #b1101100110101001110000111110011010000111011101011101110111011
+   #b1100110101001110000111110011010000111011101011101110110111011 -3 5 60)
+  (check
+   #b1011010100111000011111001101000011101110101110111011011101110
+   #b1100110101001110000111110011010000111011101011101110110111011 62 0 60)
+
+  (check
+   #b1011100110101001110000111110011010000111011101011101110111011
+   #b1100110101001110000111110011010000111011101011101110110111011 53 5 61)
+  (check
+   #b1001101010011100001111100110100001110111010111011101101110111
+   #b1100110101001110000111110011010000111011101011101110110111011 62 0 61)
+
+  (check
+   #b11011001101010011100001111100110100001110111010111011100111011
+   #b01100110101001110000111110011010000111011101011101110110111011 53 7 62)
+  (check
+   #b11011001101010011100001111100110100001110111010111011100111011
+   #b01100110101001110000111110011010000111011101011101110110111011 -2 7 62)
+  (check
+   #b01100110101001110000111110011010000111011101011101110110111011
+   #b11011001101010011100001111100110100001110111010111011100111011 2 7 62)
+
+  (pass-if-equal "bignum becomes inum"
+      1
+    (rotate-bit-field #x100000000000000000000000000000000 1 0 129)))
 
 ;;
 ;; reverse-bit-field