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

io.encodings: fix for read-until seps not containing \n.

db4
John Benediktsson 2014-10-31 09:33:59 -07:00
parent 632ee276e1
commit 5961cfb7b9
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/io/encodings/encodings-tests.factor
View File

@ -87,3 +87,15 @@ unit-test
"\r\n" read-until "\r\n" read-until
] with-byte-reader ] with-byte-reader
] unit-test ] unit-test
{
"! lol"
"! wa"
116
} [
"! lol\r\n! wat\r\n" utf8 encode
utf8 [
readln
"t" read-until
] with-byte-reader
] unit-test

11
core/io/encodings/encodings.factor
View File

@ -163,13 +163,18 @@ M: decoder stream-contents*
M: decoder stream-read-until M: decoder stream-read-until
dup cr>> [ dup cr>> [
2dup dup cr- 2dup
>decoder< decode-until >decoder< decode-until
2dup [ empty? ] [ CHAR: \n = ] bi* and [ over [
dup CHAR: \n = [
2drop stream-read-until 2drop stream-read-until
] [ ] [
[ cr- drop ] 2dip [ 2drop ] 2dip
] if ] if
] [
first-unsafe CHAR: \n = [ [ rest ] dip ] when
[ 2drop ] 2dip
] if-empty
] [ ] [
>decoder< decode-until >decoder< decode-until
] if ; ] if ;