core, basis, extra: Remove DOS line endings from files.

[factor.git] / extra / io / encodings / detect / detect.factor

diff --git a/extra/io/encodings/detect/detect.factor b/extra/io/encodings/detect/detect.factor
index c32dac75ec54a7299a51c9787a6d132be6e95bab..5c149f24cb363c456e0fb054dcb959f4d2e2df96 100644 (file)
--- a/extra/io/encodings/detect/detect.factor
+++ b/extra/io/encodings/detect/detect.factor
@@ -1,50 +1,50 @@
-! (c)2010 Joe Groff bsd license\r
-USING: accessors byte-arrays byte-arrays.hex combinators\r
-continuations fry io io.encodings io.encodings.8-bit.latin1\r
-io.encodings.ascii io.encodings.binary io.encodings.iana\r
-io.encodings.string io.encodings.utf16 io.encodings.utf32\r
-io.encodings.utf8 io.files io.streams.string kernel literals\r
-math namespaces sequences strings ;\r
-IN: io.encodings.detect\r
-\r
-SYMBOL: default-8bit-encoding\r
-default-8bit-encoding [ latin1 ] initialize\r
-\r
-<PRIVATE\r
-\r
-: prolog-tag ( bytes -- string )\r
-    CHAR: > over index [ 1 + head-slice ] when* >string ;\r
-\r
-: prolog-encoding ( string -- iana-encoding )\r
-    '[\r
-        _ "encoding=" over start\r
-        10 + swap [ [ 1 - ] dip nth ] [ index-from ] [ swapd subseq ] 2tri\r
-    ] [ drop "UTF-8" ] recover ;\r
-\r
-: detect-xml-prolog ( bytes -- encoding )\r
-    prolog-tag prolog-encoding name>encoding [ ascii ] unless* ;\r
-\r
-: valid-utf8? ( bytes -- ? )\r
-    utf8 decode 1 head-slice* replacement-char swap member? not ;\r
-\r
-PRIVATE>\r
-\r
-: detect-byte-array ( bytes -- encoding )\r
-    {\r
-        { [ dup HEX{ 0000FEFF } head? ] [ drop utf32be ] }\r
-        { [ dup HEX{ FFFE0000 } head? ] [ drop utf32le ] }\r
-        { [ dup HEX{ FEFF } head? ] [ drop utf16be ] }\r
-        { [ dup HEX{ FFFE } head? ] [ drop utf16le ] }\r
-        { [ dup HEX{ EF BB BF } head? ] [ drop utf8 ] }\r
-        { [ dup $[ "<?xml" >byte-array ] head? ] [ detect-xml-prolog ] }\r
-        { [ 0 over member? ] [ drop binary ] }\r
-        { [ dup empty? ] [ drop utf8 ] }\r
-        { [ dup valid-utf8? ] [ drop utf8 ] }\r
-        [ drop default-8bit-encoding get ]\r
-    } cond ;\r
-\r
-: detect-stream ( stream -- sample encoding )\r
-    256 swap stream-read dup detect-byte-array ;\r
-\r
-: detect-file ( file -- encoding )\r
-    binary [ input-stream get detect-stream nip ] with-file-reader ;\r
+! (c)2010 Joe Groff bsd license
+USING: accessors byte-arrays byte-arrays.hex combinators
+continuations fry io io.encodings io.encodings.8-bit.latin1
+io.encodings.ascii io.encodings.binary io.encodings.iana
+io.encodings.string io.encodings.utf16 io.encodings.utf32
+io.encodings.utf8 io.files io.streams.string kernel literals
+math namespaces sequences strings ;
+IN: io.encodings.detect
+
+SYMBOL: default-8bit-encoding
+default-8bit-encoding [ latin1 ] initialize
+
+<PRIVATE
+
+: prolog-tag ( bytes -- string )
+    CHAR: > over index [ 1 + head-slice ] when* >string ;
+
+: prolog-encoding ( string -- iana-encoding )
+    '[
+        _ "encoding=" over start
+        10 + swap [ [ 1 - ] dip nth ] [ index-from ] [ swapd subseq ] 2tri
+    ] [ drop "UTF-8" ] recover ;
+
+: detect-xml-prolog ( bytes -- encoding )
+    prolog-tag prolog-encoding name>encoding [ ascii ] unless* ;
+
+: valid-utf8? ( bytes -- ? )
+    utf8 decode 1 head-slice* replacement-char swap member? not ;
+
+PRIVATE>
+
+: detect-byte-array ( bytes -- encoding )
+    {
+        { [ dup HEX{ 0000FEFF } head? ] [ drop utf32be ] }
+        { [ dup HEX{ FFFE0000 } head? ] [ drop utf32le ] }
+        { [ dup HEX{ FEFF } head? ] [ drop utf16be ] }
+        { [ dup HEX{ FFFE } head? ] [ drop utf16le ] }
+        { [ dup HEX{ EF BB BF } head? ] [ drop utf8 ] }
+        { [ dup $[ "<?xml" >byte-array ] head? ] [ detect-xml-prolog ] }
+        { [ 0 over member? ] [ drop binary ] }
+        { [ dup empty? ] [ drop utf8 ] }
+        { [ dup valid-utf8? ] [ drop utf8 ] }
+        [ drop default-8bit-encoding get ]
+    } cond ;
+
+: detect-stream ( stream -- sample encoding )
+    256 swap stream-read dup detect-byte-array ;
+
+: detect-file ( file -- encoding )
+    binary [ input-stream get detect-stream nip ] with-file-reader ;