haskell/encoding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better detection of UTF16 endianess

Browse Source 
darcs-hash:20080119232705-a4fee-ff06e72d08068de9566b37cbc3e31f1e944162ea
This commit is contained in:
Henning Guenther 2008-01-19 15:27:05 -08:00
parent 529953686a
commit 59a8526727
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Data/Encoding/UTF16.hs
View File

@ -81,8 +81,8 @@ instance Encoding UTF16 where
UTF16 -> Put2 0xFE 0xFF UTF16 -> Put2 0xFE 0xFF
_ -> Done,str) _ -> Done,str)
encodable _ c = ord c <= 0x0010FFFF encodable _ c = ord c <= 0x0010FFFF
decode _ str = case findByteOrder str of decode bo str = case findByteOrder str of
Nothing -> decode' True 0 Nothing -> decode' (bo/=UTF16LE) 0
Just big -> decode' big 2 Just big -> decode' big 2
where where
l = BS.length str l = BS.length str
@ -97,8 +97,8 @@ instance Encoding UTF16 where
s2 = index str (i+1) s2 = index str (i+1)
s3 = index str (i+2) s3 = index str (i+2)
s4 = index str (i+3) s4 = index str (i+3)
decodeLazy _ str = case findByteOrderLazy str of decodeLazy bo str = case findByteOrderLazy str of
Nothing -> decode' True 0 Nothing -> decode' (bo/=UTF16LE) 0
Just big -> decode' big 2 Just big -> decode' big 2
where where
l = LBS.length str l = LBS.length str
@ -113,8 +113,8 @@ instance Encoding UTF16 where
s2 = LBS.index str (i+1) s2 = LBS.index str (i+1)
s3 = LBS.index str (i+2) s3 = LBS.index str (i+2)
s4 = LBS.index str (i+3) s4 = LBS.index str (i+3)
decodable _ str = case findByteOrder str of decodable bo str = case findByteOrder str of
Nothing -> check' True (length str) 0 Nothing -> check' (bo/=UTF16LE) (length str) 0
Just big -> check' big (length str) 2 Just big -> check' big (length str) 2
where where
check' be m i check' be m i