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

Merge branch 'a7a39d3766624227966bca34f0778030592d82c2' of git://github.com/prunedtree/factor into prunedtree

db4
Doug Coleman 2009-10-05 22:27:43 -05:00
parent b56880bfd7 3ee07c92d1
commit b350345f69
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basis/compression/inflate/inflate.factor
View File

@ -67,6 +67,14 @@ CONSTANT: clen-shuffle { 16 17 18 0 8 7 9 6 10 5 11 4 12 3 13 2 14 1 15 }
[ dup array? [ second 0 <repetition> ] [ 1array ] if ] map concat [ dup array? [ second 0 <repetition> ] [ 1array ] if ] map concat
nip swap cut 2array [ [ length>> [0,b) ] [ ] bi get-table ] map ; nip swap cut 2array [ [ length>> [0,b) ] [ ] bi get-table ] map ;
: static-huffman-tables ( -- tables )
0 143 [a,b] [ 8 ] replicate
144 255 [a,b] [ 9 ] replicate append
256 279 [a,b] [ 7 ] replicate append
280 287 [a,b] [ 8 ] replicate append
0 31 [a,b] [ 5 ] replicate
2array [ [ length>> [0,b) ] [ ] bi get-table ] map ;
CONSTANT: length-table CONSTANT: length-table
{ {
3 4 5 6 7 8 9 10 3 4 5 6 7 8 9 10
@ -102,9 +110,8 @@ CONSTANT: dist-table
] each ] each
bytes ; bytes ;
:: inflate-dynamic ( bitstream -- bytes ) :: inflate-huffman ( bitstream tables -- bytes )
bitstream decode-huffman-tables tables bitstream '[ _ swap <huffman-decoder> ] map :> tables
bitstream '[ _ swap <huffman-decoder> ] map :> tables
[ [
tables first read1-huff2 tables first read1-huff2
dup 256 > dup 256 >
@ -160,7 +167,11 @@ CONSTANT: dist-table
bitstream bytes>> <slice> bitstream bytes>> <slice>
len 8 * bitstream bs:seek ; len 8 * bitstream bs:seek ;
: inflate-static ( bitstream -- bytes ) zlib-unimplemented ; : inflate-dynamic ( bitstream -- bytes )
dup decode-huffman-tables inflate-huffman ;
: inflate-static ( bitstream -- bytes )
static-huffman-tables inflate-huffman ;
:: inflate-loop ( bitstream -- bytes ) :: inflate-loop ( bitstream -- bytes )
[ 1 bitstream bs:read 0 = ] [ 1 bitstream bs:read 0 = ]