use radix literals

[factor.git] / basis / io / encodings / utf32 / utf32.factor

diff --git a/basis/io/encodings/utf32/utf32.factor b/basis/io/encodings/utf32/utf32.factor
index 68fb6cd2f69d1b5a653f25f1a7ffeaedee173766..e609738ff68e0bee0c07130e5ed829971940b2ab 100644 (file)
--- a/basis/io/encodings/utf32/utf32.factor
+++ b/basis/io/encodings/utf32/utf32.factor
@@ -1,79 +1,54 @@
 ! Copyright (C) 2009 Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: math kernel io.encodings combinators io io.encodings.utf16
-generalizations sequences ;
+sequences io.binary io.encodings.iana ;
 IN: io.encodings.utf32
 
 SINGLETON: utf32be
 
+utf32be "UTF-32BE" register-encoding
+
 SINGLETON: utf32le
 
+utf32le "UTF-32LE" register-encoding
+
 SINGLETON: utf32
 
-<PRIVATE
+utf32 "UTF-32" register-encoding
 
-: 4spin ( a b c d -- b c d a )
-    4 nrev ; inline
+<PRIVATE
 
 ! Decoding
 
-: stream-read4 ( stream -- a b c d )
-    {
-        [ stream-read1 ]
-        [ stream-read1 ]
-        [ stream-read1 ]
-        [ stream-read1 ]
-    } cleave ;
-
-: with-replacement ( _ _ _ ch quot -- new-ch )
-    [ 3drop replacement-char ] if* ; inline
-
-: >char ( d c b a -- abcd )
-    [
-        24 shift -roll [
-            16 shift -rot [
-                8 shift swap [
-                    bitor bitor bitor
-                ] with-replacement
-            ] with-replacement
-        ] with-replacement
-    ] with-replacement ;
+: char> ( stream encoding quot -- ch )
+    nip swap 4 swap stream-read dup length {
+        { 0 [ 2drop f ] }
+        { 4 [ swap call ] }
+        [ 3drop replacement-char ]
+    } case ; inline
 
 M: utf32be decode-char
-    drop stream-read4 4spin
-    [ >char ] [ 3drop f ] if* ;
+    [ be> ] char> ;
 
 M: utf32le decode-char
-    drop stream-read4 4 npick
-    [ >char ] [ 2drop 2drop f ] if ;
+    [ le> ] char> ;
 
 ! Encoding
 
-: split-off ( ab -- b a )
-    [ HEX: FF bitand ] [ -8 shift ] bi ;
-
-: char> ( abcd -- d b c a )
-    split-off split-off split-off ;
-
-: stream-write4 ( d c b a stream -- )
-    {
-        [ stream-write1 ]
-        [ stream-write1 ]
-        [ stream-write1 ]
-        [ stream-write1 ]
-    } cleave ;
+: >char ( char stream encoding quot -- )
+    nip 4 swap curry dip stream-write ; inline
 
 M: utf32be encode-char
-    drop [ char> ] dip stream-write4 ;
+    [ >be ] >char ;
 
 M: utf32le encode-char
-    drop [ char> 4spin ] dip stream-write4 ;
+    [ >le ] >char ;
 
 ! UTF-32
 
-: bom-le B{ HEX: ff HEX: fe 0 0 } ; inline
+CONSTANT: bom-le B{ 0xff 0xfe 0 0 }
 
-: bom-be B{ 0 0 HEX: fe HEX: ff } ; inline
+CONSTANT: bom-be B{ 0 0 0xfe 0xff }
 
 : bom>le/be ( bom -- le/be )
     dup bom-le sequence= [ drop utf32le ] [