use radix literals

[factor.git] / basis / base64 / base64.factor

diff --git a/basis/base64/base64.factor b/basis/base64/base64.factor
index a1668e7ce93ae9899087859970c6fe3055167687..dd1af56def2937e4f834e5b796875d588c3bd3d8 100644 (file)
--- a/basis/base64/base64.factor
+++ b/basis/base64/base64.factor
@@ -1,17 +1,20 @@
 ! Copyright (C) 2008 Doug Coleman, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators io io.binary io.encodings.binary
-io.streams.byte-array io.streams.string kernel math namespaces
-sequences strings io.crlf ;
+io.streams.byte-array kernel math namespaces
+sequences strings ;
 IN: base64
 
+ERROR: malformed-base64 ;
+
 <PRIVATE
 
 : read1-ignoring ( ignoring -- ch )
     read1 2dup swap member? [ drop read1-ignoring ] [ nip ] if ;
 
 : read-ignoring ( ignoring n -- str )
-    [ drop read1-ignoring ] with map harvest
+    [ drop read1-ignoring ] with { } map-integers
+    [ { f 0 } member? not ] filter
     [ f ] [ >string ] if-empty ;
 
 : ch>base64 ( ch -- ch )
@@ -25,14 +28,14 @@ IN: base64
         f 0 f f f 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
         22 23 24 25 f f f f f f 26 27 28 29 30 31 32 33 34 35 36 37 38 39
         40 41 42 43 44 45 46 47 48 49 50 51
-    } nth ; inline
+    } nth [ malformed-base64 ] unless* ; inline
 
 SYMBOL: column
 
 : write1-lines ( ch -- )
     write1
     column get [
-        1+ [ 76 = [ crlf ] when ]
+        1 + [ 76 = [ B{ CHAR: \r CHAR: \n } write ] when ]
         [ 76 mod column set ] bi
     ] when* ;
 
@@ -40,15 +43,13 @@ SYMBOL: column
     [ write1-lines ] each ;
 
 : encode3 ( seq -- )
-    be> 4 <reversed> [
-        -6 * shift HEX: 3f bitand ch>base64 write1-lines
+    be> 4 iota <reversed> [
+        -6 * shift 0x3f bitand ch>base64 write1-lines
     ] with each ; inline
 
 : encode-pad ( seq n -- )
-    [ 3 0 pad-right binary [ encode3 ] with-byte-writer ]
-    [ 1+ ] bi* head-slice 4 CHAR: = pad-right write-lines ; inline
-
-ERROR: malformed-base64 ;
+    [ 3 0 pad-tail binary [ encode3 ] with-byte-writer ]
+    [ 1 + ] bi* head-slice 4 CHAR: = pad-tail write-lines ; inline
 
 : decode4 ( seq -- )
     [ 0 [ base64>ch swap 6 shift bitor ] reduce 3 >be ]
@@ -75,10 +76,10 @@ PRIVATE>
     } case ;
 
 : >base64 ( seq -- base64 )
-    binary [ [ encode-base64 ] with-string-reader ] with-byte-writer ;
+    binary [ binary [ encode-base64 ] with-byte-reader ] with-byte-writer ;
 
 : base64> ( base64 -- seq )
-    [ binary [ decode-base64 ] with-byte-reader ] with-string-writer ;
+    binary [ binary [ decode-base64 ] with-byte-reader ] with-byte-writer ;
 
 : >base64-lines ( seq -- base64 )
-    binary [ [ encode-base64-lines ] with-string-reader ] with-byte-writer ;
+    binary [ binary [ encode-base64-lines ] with-byte-reader ] with-byte-writer ;