Fix compile error in nibble-arrays and add some unit tests

diff --git a/basis/nibble-arrays/nibble-arrays-tests.factor b/basis/nibble-arrays/nibble-arrays-tests.factor
new file mode 100644 (file)
index 0000000..2a0eef7
--- /dev/null
+++ b/basis/nibble-arrays/nibble-arrays-tests.factor
@@ -0,0 +1,6 @@
+USING: nibble-arrays tools.test sequences kernel math ;
+IN: nibble-arrays.tests
+
+[ t ] [ 16 dup >nibble-array sequence= ] unit-test
+[ N{ 4 2 1 3 } ] [ N{ 3 1 2 4 } reverse ] unit-test
+[ N{ 1 4 9 0 9 4 } ] [ N{ 1 2 3 4 5 6 } [ sq ] map ] unit-test

diff --git a/basis/nibble-arrays/nibble-arrays.factor b/basis/nibble-arrays/nibble-arrays.factor
index 170f41a2d94f463e105019ca8c7eb8b2932ddbd4..c753d0fb78589c9662188f479a0b3b29d00d5982 100644 (file)
--- a/basis/nibble-arrays/nibble-arrays.factor
+++ b/basis/nibble-arrays/nibble-arrays.factor
@@ -17,10 +17,10 @@ TUPLE: nibble-array
 : byte/nibble ( n -- shift n' )
     [ 1 bitand 2 shift ] [ -1 shift ] bi ; inline
 
-: get-nibble ( shift n byte -- nibble )
+: get-nibble ( n byte -- nibble )
     swap neg shift nibble bitand ; inline
 
-: set-nibble ( value shift n byte -- byte' )
+: set-nibble ( value n byte -- byte' )
     nibble pick shift bitnot bitand -rot shift bitor ; inline
 
 : nibble@ ( n nibble-array -- shift n' byte-array )