steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bit-arrays: use integer>fixnum, cleanup resize.

db4
John Benediktsson 2013-04-04 18:12:20 -07:00
parent 0b60d6cc4c
commit 4e2e8a21e0
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
basis/bit-arrays/bit-arrays.factor
View File

@ -18,7 +18,7 @@ TUPLE: bit-array
: bit/byte ( n -- bit byte ) [ 7 bitand ] [ n>byte ] bi ; inline : bit/byte ( n -- bit byte ) [ 7 bitand ] [ n>byte ] bi ; inline
: bit-index ( n bit-array -- bit# byte# byte-array ) : bit-index ( n bit-array -- bit# byte# byte-array )
[ >fixnum bit/byte ] [ underlying>> ] bi* ; inline [ integer>fixnum bit/byte ] [ underlying>> ] bi* ; inline
: bits>cells ( m -- n ) 31 + -5 shift ; inline : bits>cells ( m -- n ) 31 + -5 shift ; inline
@ -28,17 +28,17 @@ TUPLE: bit-array
[ [ length bits>cells ] keep ] dip swap underlying>> [ [ length bits>cells ] keep ] dip swap underlying>>
'[ [ _ _ ] dip 4 * set-alien-unsigned-4 ] each-integer ; inline '[ [ _ _ ] dip 4 * set-alien-unsigned-4 ] each-integer ; inline
: clean-up ( bit-array -- ) : clean-up ( bit-array -- bit-array )
! Zero bits after the end. ! Zero bits after the end.
dup underlying>> empty? [ drop ] [ dup underlying>> [ ] [
[ [
[ underlying>> length 8 * ] [ length ] bi - length 8 * over length -
8 swap - -1 swap shift bitnot 8 swap - -1 swap shift bitnot
] ]
[ underlying>> last bitand ] [ last bitand ]
[ underlying>> set-last ] [ set-last ]
tri tri
] if ; inline ] if-empty ; inline
:: toggle-bit ( ? n x -- y ) :: toggle-bit ( ? n x -- y )
x n ? [ set-bit ] [ clear-bit ] if ; inline x n ? [ set-bit ] [ clear-bit ] if ; inline
@ -82,12 +82,8 @@ M: bit-array equal?
over bit-array? [ [ underlying>> ] bi@ sequence= ] [ 2drop f ] if ; over bit-array? [ [ underlying>> ] bi@ sequence= ] [ 2drop f ] if ;
M: bit-array resize M: bit-array resize
[ drop ] [ dupd [ bits>bytes ] [ underlying>> ] bi*
[ bits>bytes ] [ underlying>> ] bi* resize-byte-array bit-array boa clean-up ; inline
resize-byte-array
] 2bi
bit-array boa
dup clean-up ; inline
M: bit-array byte-length length bits>bytes ; inline M: bit-array byte-length length bits>bytes ; inline