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

base85: fix handling of pad characters.

John Benediktsson 2013-04-04 11:43:17 -07:00
parent 6e37886e19
commit af4dd22fe9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/base85/base85-tests.factor
View File

@ -2,3 +2,6 @@ USING: kernel strings tools.test ;
IN: base85 IN: base85
{ t } [ "Hello, world" dup >base85 base85> >string = ] unit-test { t } [ "Hello, world" dup >base85 base85> >string = ] unit-test
{ "NM!&3" } [ "He" >base85 >string ] unit-test
{ t } [ "He" dup >base85 base85> >string = ] unit-test

12
extra/base85/base85.factor
View File

@ -29,15 +29,11 @@ ERROR: malformed-base85 ;
reverse! nip [ _ write1-lines ] each reverse! nip [ _ write1-lines ] each
] change ; inline ] change ; inline
: encode-pad ( seq n -- )
[ 4 0 pad-tail binary [ encode4 ] with-byte-writer ]
[ 1 + ] bi* head-slice 5 CHAR: = pad-tail write-lines ; inline
: (encode-base85) ( stream -- ) : (encode-base85) ( stream -- )
4 over stream-read dup length { 4 over stream-read dup length {
{ 0 [ 2drop ] } { 0 [ 2drop ] }
{ 4 [ encode4 (encode-base85) ] } { 4 [ encode4 (encode-base85) ] }
[ encode-pad (encode-base85) ] [ drop 4 0 pad-tail encode4 (encode-base85) ]
} case ; } case ;
PRIVATE> PRIVATE>
@ -51,9 +47,9 @@ PRIVATE>
<PRIVATE <PRIVATE
: decode5 ( seq -- ) : decode5 ( seq -- )
[ 0 [ [ 85 * ] [ base85>ch ] bi* + ] reduce 4 >be ] 0 [ [ 85 * ] [ base85>ch ] bi* + ] reduce 4 >be
[ [ CHAR: = = ] count ] bi head-slice* [ zero? ] trim-tail-slice output-stream get
output-stream get '[ _ stream-write1 ] each ; inline '[ _ stream-write1 ] each ; inline
: (decode-base85) ( stream -- ) : (decode-base85) ( stream -- )
5 "\n\r" pick read-ignoring dup length { 5 "\n\r" pick read-ignoring dup length {