data-binary-ieee754 0.4.1 → 0.4.2

raw patch · 6 files changed

+266/−1176 lines, 6 filesdep +QuickCheckdep +test-frameworkdep +test-framework-quickcheck2dep ~basenew-component:exe:data-binary-ieee754_testsPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: QuickCheck, test-framework, test-framework-quickcheck2

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• Data/Binary/IEEE754.hs +119/−0
• Data/Binary/IEEE754.lhs +0/−402
• License.txt +19/−671
• Tests.hs +107/−66
• data-binary-ieee754.cabal +21/−9
• data-binary-ieee754.tex +0/−28

@@ -0,0 +1,119 @@+-----------------------------------------------------------------------------+-- |+-- Module: Data.Binary.IEEE754+-- Copyright: 2010 John Millikin+-- License: MIT+--+-- Maintainer: jmillikin@gmail.com+-- Portability: portable+--+-----------------------------------------------------------------------------+module Data.Binary.IEEE754 (+	-- * Parsing+	  getFloat16be, getFloat16le+	, getFloat32be, getFloat32le+	, getFloat64be, getFloat64le+	+	-- * Serializing+	, putFloat32be, putFloat32le+	, putFloat64be, putFloat64le+	+	-- * Float <-> Word conversion+	, floatToWord, wordToFloat+	, doubleToWord, wordToDouble+) where++import Prelude hiding (exp)+import Data.Bits (shiftL, shiftR, (.|.), (.&.))+import qualified Data.Binary.Get as G+import qualified Data.Binary.Put as P+import qualified Foreign as F++getFloat16be :: G.Get Float+getFloat16be = fmap toFloat16 G.getWord16be++getFloat16le :: G.Get Float+getFloat16le = fmap toFloat16 G.getWord16le++getFloat32be :: G.Get Float+getFloat32be = fmap toFloat G.getWord32be++getFloat32le :: G.Get Float+getFloat32le = fmap toFloat G.getWord32le++getFloat64be :: G.Get Double+getFloat64be = fmap toFloat G.getWord64be++getFloat64le :: G.Get Double+getFloat64le = fmap toFloat G.getWord64le++putFloat32be :: Float -> P.Put+putFloat32be = P.putWord32be . fromFloat++putFloat32le :: Float -> P.Put+putFloat32le = P.putWord32le . fromFloat++putFloat64be :: Double -> P.Put+putFloat64be = P.putWord64be . fromFloat++putFloat64le :: Double -> P.Put+putFloat64le = P.putWord64le . fromFloat++floatToWord :: Float -> F.Word32+floatToWord = fromFloat++wordToFloat :: F.Word32 -> Float+wordToFloat = toFloat++doubleToWord :: Double -> F.Word64+doubleToWord = fromFloat++wordToDouble :: F.Word64 -> Double+wordToDouble = toFloat++toFloat :: (F.Storable word, F.Storable float) => word -> float+toFloat word = F.unsafePerformIO $ F.alloca $ \buf -> do+	F.poke (F.castPtr buf) word+	F.peek buf++fromFloat :: (F.Storable word, F.Storable float) => float -> word+fromFloat float = F.unsafePerformIO $ F.alloca $ \buf -> do+	F.poke (F.castPtr buf) float+	F.peek buf++toFloat16 :: F.Word16 -> Float+toFloat16 word16 = toFloat (sign32 .|. word32) where+	sign16 = word16 .&. 0x8000+	exp16 = word16 .&. 0x7C00+	frac16 = word16 .&. 0x3FF+	+	sign32 = if sign16 > 0+		then 0x80000000 -- -0.0+		else 0+	+	word32 :: F.Word32+	word32 | word16 .&. 0x7FFF == 0 = 0+	       | exp16 == 0x7C00 = special+	       | otherwise = shiftL exp32 23 .|. shiftL frac32 13+	+	special = if frac16 == 0+		-- Infinity+		then 0x7F800000+		+		-- NaN; signals are maintained in lower 10 bits+		else 0x7FC00000 .|. fromIntegral frac16+	+	(exp32, frac32) = if exp16 > 0+		then normalised+		else denormalised+	+	normalised = (exp, frac) where+		exp = (fromIntegral exp16 `shiftR` 10) - 15 + 127+		frac = fromIntegral frac16+	+	denormalised = (exp, frac) where+		exp = (fromIntegral exp16 `shiftR` 10) - 15 + 127 - e+		(e, frac ) = step 0 (shiftL frac16 1) where+			step acc x = if x .&. 0x400 == 0+				then step (acc + 1) (shiftL x 1)+				else (acc, fromIntegral x .&. 0x3FF)

@@ -1,402 +0,0 @@-% Copyright (C) 2009 John Millikin <jmillikin@gmail.com>-% -% This program is free software: you can redistribute it and/or modify-% it under the terms of the GNU General Public License as published by-% the Free Software Foundation, either version 3 of the License, or-% any later version.-% -% This program is distributed in the hope that it will be useful,-% but WITHOUT ANY WARRANTY; without even the implied warranty of-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the-% GNU General Public License for more details.-% -% You should have received a copy of the GNU General Public License-% along with this program.  If not, see <http://www.gnu.org/licenses/>.--\ignore{-\begin{code}-{-# LANGUAGE GeneralizedNewtypeDeriving #-}-module Data.Binary.IEEE754 (-	-- * Parsing-	  getFloat16be, getFloat16le-	, getFloat32be, getFloat32le-	, getFloat64be, getFloat64le-	-	-- * Serializing-	, putFloat32be, putFloat32le-	, putFloat64be, putFloat64le-) where--import Data.Bits ((.&.), (.|.), shiftL, shiftR, Bits)-import Data.Word (Word8)-import Data.List (foldl')--import qualified Data.ByteString as B-import Data.Binary.Get (Get, getByteString)-import Data.Binary.Put (Put, putByteString)-\end{code}-}--\section{Parsing}--\subsection{Public interface}--\begin{code}-getFloat16be :: Get Float-getFloat16be = getFloat (ByteCount 2) splitBytes-\end{code}--\begin{code}-getFloat16le :: Get Float-getFloat16le = getFloat (ByteCount 2) $ splitBytes . reverse-\end{code}--\begin{code}-getFloat32be :: Get Float-getFloat32be = getFloat (ByteCount 4) splitBytes-\end{code}--\begin{code}-getFloat32le :: Get Float-getFloat32le = getFloat (ByteCount 4) $ splitBytes . reverse-\end{code}--\begin{code}-getFloat64be :: Get Double-getFloat64be = getFloat (ByteCount 8) splitBytes-\end{code}--\begin{code}-getFloat64le :: Get Double-getFloat64le = getFloat (ByteCount 8) $ splitBytes . reverse-\end{code}--\subsection{Implementation}--Split the raw byte array into (sign, exponent, significand) components.-The exponent and signifcand are drawn directly from the bits in the-original float, and have not been unbiased or otherwise modified.--\begin{code}-splitBytes :: [Word8] -> RawFloat-splitBytes bs = RawFloat width sign exp' sig expWidth sigWidth where-	width = ByteCount (length bs)-	nBits = bitsInWord8 bs-	sign = if head bs .&. 0x80 == 0x80-		then Negative-		else Positive-	-	expStart = 1-	expWidth = exponentWidth nBits-	expEnd = expStart + expWidth-	exp' = Exponent . fromIntegral $ bitSlice bs expStart expEnd-	-	sigWidth = nBits - expEnd-	sig  = Significand $ bitSlice bs expEnd nBits-\end{code}--\subsubsection{Encodings and special values}--The next step depends on the value of the exponent $e$, size of the-exponent field in bits $w$, and value of the significand.--\begin{table}[h]-\begin{center}-\begin{tabular}{lrl}-\toprule-Exponent                & Significand & Format \\-\midrule-$0$                     & $0$           & Zero \\-$0$                     & $> 0$         & Denormalised \\-$1 \leq e \leq 2^w - 2$ & \textit{any} & Normalised \\-$2^w-1$                 & $0$           & Infinity \\-$2^w-1$                 & $> 0$         & NaN \\-\bottomrule-\end{tabular}-\end{center}-\end{table}--There's no built-in literals for Infinity or NaN, so they-are constructed using the {\tt Read} instances for {\tt Double} and-{\tt Float}.--\begin{code}-merge :: (Read a, RealFloat a) => RawFloat -> a-merge f@(RawFloat _ _ e sig eWidth _)-	| e == 0 = if sig == 0-		then 0.0-		else denormalised f-	| e == eMax - 1 = if sig == 0-		then read "Infinity"-		else read "NaN"-	| otherwise = normalised f-	where eMax = 2 `pow` eWidth-\end{code}--If a value is normalised, its significand has an implied {\tt 1} bit-in its most-significant bit. The significand must be adjusted by-this value before being passed to {\tt encodeField}.--\begin{code}-normalised :: RealFloat a => RawFloat -> a-normalised f = encodeFloat fraction exp' where-	Significand sig = rawSignificand f-	Exponent exp' = unbiased - sigWidth-	-	fraction = sig + (1 `bitShiftL` rawSignificandWidth f)-	-	sigWidth = fromIntegral $ rawSignificandWidth f-	unbiased = unbias (rawExponent f) (rawExponentWidth f)-\end{code}--For denormalised values, the implied {\tt 1} bit is the least-significant-bit of the exponent.--\begin{code}-denormalised :: RealFloat a => RawFloat -> a-denormalised f = encodeFloat sig exp' where-	Significand sig = rawSignificand f-	Exponent exp' = unbiased - sigWidth + 1-	-	sigWidth = fromIntegral $ rawSignificandWidth f-	unbiased = unbias (rawExponent f) (rawExponentWidth f)-\end{code}--By composing {\tt splitBytes} and {\tt merge}, the absolute value of the-float is calculated. Before being returned to the calling function, it-must be signed appropriately.--\begin{code}-getFloat :: (Read a, RealFloat a) => ByteCount-            -> ([Word8] -> RawFloat) -> Get a-getFloat (ByteCount width) parser = do-	raw <- fmap (parser . B.unpack) $ getByteString width-	let absFloat = merge raw-	return $ case rawSign raw of-		Positive ->  absFloat-		Negative -> -absFloat-\end{code}--\section{Serialising}--\subsection{Public interface}--\begin{code}-putFloat32be :: Float -> Put-putFloat32be = putFloat (ByteCount 4) id-\end{code}--\begin{code}-putFloat32le :: Float -> Put-putFloat32le = putFloat (ByteCount 4) reverse-\end{code}--\begin{code}-putFloat64be :: Double -> Put-putFloat64be = putFloat (ByteCount 8) id-\end{code}--\begin{code}-putFloat64le :: Double -> Put-putFloat64le = putFloat (ByteCount 8) reverse-\end{code}--\subsection{Implementation}--Serialisation is similar to parsing. First, the float is converted to-a structure representing raw bitfields. The values returned from-{\tt decodeFloat} are clamped to their expected lengths before being-stored in the {\tt RawFloat}.--\begin{code}-splitFloat :: RealFloat a => ByteCount -> a -> RawFloat-splitFloat width x = raw where-	raw = RawFloat width sign clampedExp clampedSig expWidth sigWidth-	sign = if isNegativeNaN x || isNegativeZero x || x < 0-		then Negative-		else Positive-	clampedExp = clamp expWidth exp'-	clampedSig = clamp sigWidth sig-	(exp', sig) = case (dFraction, dExponent, biasedExp) of-		(0, 0, _) -> (0, 0)-		(_, _, 0) -> (0, Significand $ truncatedSig + 1)-		_         -> (biasedExp, Significand truncatedSig)-	expWidth = exponentWidth $ bitCount width-	sigWidth = bitCount width - expWidth - 1 -- 1 for sign bit-	-	(dFraction, dExponent) = decodeFloat x-	-	rawExp = Exponent $ dExponent + fromIntegral sigWidth-	biasedExp = bias rawExp expWidth-	truncatedSig = abs dFraction - (1 `bitShiftL` sigWidth)-\end{code}--Then, the {\tt RawFloat} is converted to a list of bytes by mashing all-the fields together into an {\tt Integer}, and chopping up that integer-in 8-bit blocks.--\begin{code}-rawToBytes :: RawFloat -> [Word8]-rawToBytes raw = integerToBytes mashed width where-	RawFloat width sign exp' sig expWidth sigWidth = raw-	sign' :: Word8-	sign' = case sign of-		Positive -> 0-		Negative -> 1-	mashed = mashBits sig sigWidth .-	         mashBits exp' expWidth .-	         mashBits sign' 1 $ 0-\end{code}--{\tt clamp}, given a maximum bit count and a value, will strip any 1-bits-in positions above the count.--\begin{code}-clamp :: Bits a => BitCount -> a -> a-clamp = (.&.) . mask where-	mask 1 = 1-	mask n | n > 1 = (mask (n - 1) `shiftL` 1) + 1-	mask _ = undefined-\end{code}--For merging the fields, just shift the starting integer over a bit and-then \textsc{or} it with the next value. The weird parameter order allows-easy composition.--\begin{code}-mashBits :: (Bits a, Integral a) => a -> BitCount -> Integer -> Integer-mashBits _ 0 x = x-mashBits y n x = (x `bitShiftL` n) .|. fromIntegral y-\end{code}--Given an integer, read it in 255-block increments starting from the LSB.-Each increment is converted to a byte and added to the final list.--\begin{code}-integerToBytes :: Integer -> ByteCount -> [Word8]-integerToBytes _ 0 = []-integerToBytes x n = bytes where-	bytes = integerToBytes (x `shiftR` 8) (n - 1) ++ [step]-	step = fromIntegral x .&. 0xFF-\end{code}--Finally, the raw parsing is wrapped up in {\tt Put}. The second parameter-allows the same code paths to be used for little- and big-endian-serialisation.--\begin{code}-putFloat :: (RealFloat a) => ByteCount -> ([Word8] -> [Word8]) -> a -> Put-putFloat width f x = putByteString $ B.pack bytes where-	bytes = f . rawToBytes . splitFloat width $ x-\end{code}--\section{Raw float components}--Information about the raw bit patterns in the float is stored in-{\tt RawFloat}, so they don't have to be passed around to the various-format cases. The exponent should be biased, and the significand-shouldn't have it's implied MSB (if applicable).--\begin{code}-data RawFloat = RawFloat-	{ rawWidth            :: ByteCount-	, rawSign             :: Sign-	, rawExponent         :: Exponent-	, rawSignificand      :: Significand-	, rawExponentWidth    :: BitCount-	, rawSignificandWidth :: BitCount-	}-	deriving (Show)-\end{code}--\section{Exponents}--Calculate the proper size of the exponent field, in bits, given the-size of the full structure.--\begin{code}-exponentWidth :: BitCount -> BitCount-exponentWidth k-	| k == 16         = 5-	| k == 32         = 8-	| k `mod` 32 == 0 = ceiling (4 * logBase 2 (fromIntegral k)) - 13-	| otherwise       = error "Invalid length of floating-point value"-\end{code}--\begin{code}-bias :: Exponent -> BitCount -> Exponent-bias e eWidth = e - (1 - (2 `pow` (eWidth - 1)))-\end{code}--\begin{code}-unbias :: Exponent -> BitCount -> Exponent-unbias e eWidth = e + 1 - (2 `pow` (eWidth - 1))-\end{code}--\section{Byte and bit counting}--\begin{code}-data Sign = Positive | Negative-	deriving (Show)--newtype Exponent = Exponent Int-	deriving (Show, Eq, Num, Ord, Real, Enum, Integral, Bits)--newtype Significand = Significand Integer-	deriving (Show, Eq, Num, Ord, Real, Enum, Integral, Bits)--newtype BitCount = BitCount Int-	deriving (Show, Eq, Num, Ord, Real, Enum, Integral)--newtype ByteCount = ByteCount Int-	deriving (Show, Eq, Num, Ord, Real, Enum, Integral)--bitCount :: ByteCount -> BitCount-bitCount (ByteCount x) = BitCount (x * 8)--bitsInWord8 :: [Word8] -> BitCount-bitsInWord8 = bitCount . ByteCount . length--bitShiftL :: (Bits a) => a -> BitCount -> a-bitShiftL x (BitCount n) = shiftL x n--bitShiftR :: (Bits a) => a -> BitCount -> a-bitShiftR x (BitCount n) = shiftR x n-\end{code}--\section{Utility}--Considering a byte list as a sequence of bits, slice it from start-inclusive to end exclusive, and return the resulting bit sequence as an-integer.--\begin{code}-bitSlice :: [Word8] -> BitCount -> BitCount -> Integer-bitSlice bs = sliceInt (foldl' step 0 bs) bitCount' where-	step acc w     = shiftL acc 8 + fromIntegral w-	bitCount'      = bitsInWord8 bs-\end{code}--Slice a single integer by start and end bit location--\begin{code}-sliceInt :: Integer -> BitCount -> BitCount -> BitCount -> Integer-sliceInt x xBitCount s e = fromIntegral sliced where-	sliced = (x .&. startMask) `bitShiftR` (xBitCount - e)-	startMask = n1Bits (xBitCount - s)-	n1Bits n  = (2 `pow` n) - 1-\end{code}--Integral version of {\tt (**)}--\begin{code}-pow :: (Integral a, Integral b, Integral c) => a -> b -> c-pow b e = floor $ fromIntegral b ** fromIntegral e-\end{code}--Detect whether a float is {\tt $-$NaN}--\begin{code}-isNegativeNaN :: RealFloat a => a -> Bool-isNegativeNaN x = isNaN x && (floor x > 0)-\end{code}

@@ -1,674 +1,22 @@-                    GNU GENERAL PUBLIC LICENSE-                       Version 3, 29 June 2007-- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>- Everyone is permitted to copy and distribute verbatim copies- of this license document, but changing it is not allowed.--                            Preamble--  The GNU General Public License is a free, copyleft license for-software and other kinds of works.--  The licenses for most software and other practical works are designed-to take away your freedom to share and change the works.  By contrast,-the GNU General Public License is intended to guarantee your freedom to-share and change all versions of a program--to make sure it remains free-software for all its users.  We, the Free Software Foundation, use the-GNU General Public License for most of our software; it applies also to-any other work released this way by its authors.  You can apply it to-your programs, too.--  When we speak of free software, we are referring to freedom, not-price.  Our General Public Licenses are designed to make sure that you-have the freedom to distribute copies of free software (and charge for-them if you wish), that you receive source code or can get it if you-want it, that you can change the software or use pieces of it in new-free programs, and that you know you can do these things.--  To protect your rights, we need to prevent others from denying you-these rights or asking you to surrender the rights.  Therefore, you have-certain responsibilities if you distribute copies of the software, or if-you modify it: responsibilities to respect the freedom of others.--  For example, if you distribute copies of such a program, whether-gratis or for a fee, you must pass on to the recipients the same-freedoms that you received.  You must make sure that they, too, receive-or can get the source code.  And you must show them these terms so they-know their rights.--  Developers that use the GNU GPL protect your rights with two steps:-(1) assert copyright on the software, and (2) offer you this License-giving you legal permission to copy, distribute and/or modify it.--  For the developers' and authors' protection, the GPL clearly explains-that there is no warranty for this free software.  For both users' and-authors' sake, the GPL requires that modified versions be marked as-changed, so that their problems will not be attributed erroneously to-authors of previous versions.--  Some devices are designed to deny users access to install or run-modified versions of the software inside them, although the manufacturer-can do so.  This is fundamentally incompatible with the aim of-protecting users' freedom to change the software.  The systematic-pattern of such abuse occurs in the area of products for individuals to-use, which is precisely where it is most unacceptable.  Therefore, we-have designed this version of the GPL to prohibit the practice for those-products.  If such problems arise substantially in other domains, we-stand ready to extend this provision to those domains in future versions-of the GPL, as needed to protect the freedom of users.--  Finally, every program is threatened constantly by software patents.-States should not allow patents to restrict development and use of-software on general-purpose computers, but in those that do, we wish to-avoid the special danger that patents applied to a free program could-make it effectively proprietary.  To prevent this, the GPL assures that-patents cannot be used to render the program non-free.--  The precise terms and conditions for copying, distribution and-modification follow.--                       TERMS AND CONDITIONS--  0. Definitions.--  "This License" refers to version 3 of the GNU General Public License.--  "Copyright" also means copyright-like laws that apply to other kinds of-works, such as semiconductor masks.--  "The Program" refers to any copyrightable work licensed under this-License.  Each licensee is addressed as "you".  "Licensees" and-"recipients" may be individuals or organizations.--  To "modify" a work means to copy from or adapt all or part of the work-in a fashion requiring copyright permission, other than the making of an-exact copy.  The resulting work is called a "modified version" of the-earlier work or a work "based on" the earlier work.--  A "covered work" means either the unmodified Program or a work based-on the Program.--  To "propagate" a work means to do anything with it that, without-permission, would make you directly or secondarily liable for-infringement under applicable copyright law, except executing it on a-computer or modifying a private copy.  Propagation includes copying,-distribution (with or without modification), making available to the-public, and in some countries other activities as well.--  To "convey" a work means any kind of propagation that enables other-parties to make or receive copies.  Mere interaction with a user through-a computer network, with no transfer of a copy, is not conveying.--  An interactive user interface displays "Appropriate Legal Notices"-to the extent that it includes a convenient and prominently visible-feature that (1) displays an appropriate copyright notice, and (2)-tells the user that there is no warranty for the work (except to the-extent that warranties are provided), that licensees may convey the-work under this License, and how to view a copy of this License.  If-the interface presents a list of user commands or options, such as a-menu, a prominent item in the list meets this criterion.--  1. Source Code.--  The "source code" for a work means the preferred form of the work-for making modifications to it.  "Object code" means any non-source-form of a work.--  A "Standard Interface" means an interface that either is an official-standard defined by a recognized standards body, or, in the case of-interfaces specified for a particular programming language, one that-is widely used among developers working in that language.--  The "System Libraries" of an executable work include anything, other-than the work as a whole, that (a) is included in the normal form of-packaging a Major Component, but which is not part of that Major-Component, and (b) serves only to enable use of the work with that-Major Component, or to implement a Standard Interface for which an-implementation is available to the public in source code form.  A-"Major Component", in this context, means a major essential component-(kernel, window system, and so on) of the specific operating system-(if any) on which the executable work runs, or a compiler used to-produce the work, or an object code interpreter used to run it.--  The "Corresponding Source" for a work in object code form means all-the source code needed to generate, install, and (for an executable-work) run the object code and to modify the work, including scripts to-control those activities.  However, it does not include the work's-System Libraries, or general-purpose tools or generally available free-programs which are used unmodified in performing those activities but-which are not part of the work.  For example, Corresponding Source-includes interface definition files associated with source files for-the work, and the source code for shared libraries and dynamically-linked subprograms that the work is specifically designed to require,-such as by intimate data communication or control flow between those-subprograms and other parts of the work.--  The Corresponding Source need not include anything that users-can regenerate automatically from other parts of the Corresponding-Source.--  The Corresponding Source for a work in source code form is that-same work.--  2. Basic Permissions.--  All rights granted under this License are granted for the term of-copyright on the Program, and are irrevocable provided the stated-conditions are met.  This License explicitly affirms your unlimited-permission to run the unmodified Program.  The output from running a-covered work is covered by this License only if the output, given its-content, constitutes a covered work.  This License acknowledges your-rights of fair use or other equivalent, as provided by copyright law.--  You may make, run and propagate covered works that you do not-convey, without conditions so long as your license otherwise remains-in force.  You may convey covered works to others for the sole purpose-of having them make modifications exclusively for you, or provide you-with facilities for running those works, provided that you comply with-the terms of this License in conveying all material for which you do-not control copyright.  Those thus making or running the covered works-for you must do so exclusively on your behalf, under your direction-and control, on terms that prohibit them from making any copies of-your copyrighted material outside their relationship with you.--  Conveying under any other circumstances is permitted solely under-the conditions stated below.  Sublicensing is not allowed; section 10-makes it unnecessary.--  3. Protecting Users' Legal Rights From Anti-Circumvention Law.--  No covered work shall be deemed part of an effective technological-measure under any applicable law fulfilling obligations under article-11 of the WIPO copyright treaty adopted on 20 December 1996, or-similar laws prohibiting or restricting circumvention of such-measures.--  When you convey a covered work, you waive any legal power to forbid-circumvention of technological measures to the extent such circumvention-is effected by exercising rights under this License with respect to-the covered work, and you disclaim any intention to limit operation or-modification of the work as a means of enforcing, against the work's-users, your or third parties' legal rights to forbid circumvention of-technological measures.--  4. Conveying Verbatim Copies.--  You may convey verbatim copies of the Program's source code as you-receive it, in any medium, provided that you conspicuously and-appropriately publish on each copy an appropriate copyright notice;-keep intact all notices stating that this License and any-non-permissive terms added in accord with section 7 apply to the code;-keep intact all notices of the absence of any warranty; and give all-recipients a copy of this License along with the Program.--  You may charge any price or no price for each copy that you convey,-and you may offer support or warranty protection for a fee.--  5. Conveying Modified Source Versions.--  You may convey a work based on the Program, or the modifications to-produce it from the Program, in the form of source code under the-terms of section 4, provided that you also meet all of these conditions:--    a) The work must carry prominent notices stating that you modified-    it, and giving a relevant date.--    b) The work must carry prominent notices stating that it is-    released under this License and any conditions added under section-    7.  This requirement modifies the requirement in section 4 to-    "keep intact all notices".--    c) You must license the entire work, as a whole, under this-    License to anyone who comes into possession of a copy.  This-    License will therefore apply, along with any applicable section 7-    additional terms, to the whole of the work, and all its parts,-    regardless of how they are packaged.  This License gives no-    permission to license the work in any other way, but it does not-    invalidate such permission if you have separately received it.--    d) If the work has interactive user interfaces, each must display-    Appropriate Legal Notices; however, if the Program has interactive-    interfaces that do not display Appropriate Legal Notices, your-    work need not make them do so.--  A compilation of a covered work with other separate and independent-works, which are not by their nature extensions of the covered work,-and which are not combined with it such as to form a larger program,-in or on a volume of a storage or distribution medium, is called an-"aggregate" if the compilation and its resulting copyright are not-used to limit the access or legal rights of the compilation's users-beyond what the individual works permit.  Inclusion of a covered work-in an aggregate does not cause this License to apply to the other-parts of the aggregate.--  6. Conveying Non-Source Forms.--  You may convey a covered work in object code form under the terms-of sections 4 and 5, provided that you also convey the-machine-readable Corresponding Source under the terms of this License,-in one of these ways:--    a) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by the-    Corresponding Source fixed on a durable physical medium-    customarily used for software interchange.--    b) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by a-    written offer, valid for at least three years and valid for as-    long as you offer spare parts or customer support for that product-    model, to give anyone who possesses the object code either (1) a-    copy of the Corresponding Source for all the software in the-    product that is covered by this License, on a durable physical-    medium customarily used for software interchange, for a price no-    more than your reasonable cost of physically performing this-    conveying of source, or (2) access to copy the-    Corresponding Source from a network server at no charge.--    c) Convey individual copies of the object code with a copy of the-    written offer to provide the Corresponding Source.  This-    alternative is allowed only occasionally and noncommercially, and-    only if you received the object code with such an offer, in accord-    with subsection 6b.--    d) Convey the object code by offering access from a designated-    place (gratis or for a charge), and offer equivalent access to the-    Corresponding Source in the same way through the same place at no-    further charge.  You need not require recipients to copy the-    Corresponding Source along with the object code.  If the place to-    copy the object code is a network server, the Corresponding Source-    may be on a different server (operated by you or a third party)-    that supports equivalent copying facilities, provided you maintain-    clear directions next to the object code saying where to find the-    Corresponding Source.  Regardless of what server hosts the-    Corresponding Source, you remain obligated to ensure that it is-    available for as long as needed to satisfy these requirements.--    e) Convey the object code using peer-to-peer transmission, provided-    you inform other peers where the object code and Corresponding-    Source of the work are being offered to the general public at no-    charge under subsection 6d.--  A separable portion of the object code, whose source code is excluded-from the Corresponding Source as a System Library, need not be-included in conveying the object code work.--  A "User Product" is either (1) a "consumer product", which means any-tangible personal property which is normally used for personal, family,-or household purposes, or (2) anything designed or sold for incorporation-into a dwelling.  In determining whether a product is a consumer product,-doubtful cases shall be resolved in favor of coverage.  For a particular-product received by a particular user, "normally used" refers to a-typical or common use of that class of product, regardless of the status-of the particular user or of the way in which the particular user-actually uses, or expects or is expected to use, the product.  A product-is a consumer product regardless of whether the product has substantial-commercial, industrial or non-consumer uses, unless such uses represent-the only significant mode of use of the product.--  "Installation Information" for a User Product means any methods,-procedures, authorization keys, or other information required to install-and execute modified versions of a covered work in that User Product from-a modified version of its Corresponding Source.  The information must-suffice to ensure that the continued functioning of the modified object-code is in no case prevented or interfered with solely because-modification has been made.--  If you convey an object code work under this section in, or with, or-specifically for use in, a User Product, and the conveying occurs as-part of a transaction in which the right of possession and use of the-User Product is transferred to the recipient in perpetuity or for a-fixed term (regardless of how the transaction is characterized), the-Corresponding Source conveyed under this section must be accompanied-by the Installation Information.  But this requirement does not apply-if neither you nor any third party retains the ability to install-modified object code on the User Product (for example, the work has-been installed in ROM).--  The requirement to provide Installation Information does not include a-requirement to continue to provide support service, warranty, or updates-for a work that has been modified or installed by the recipient, or for-the User Product in which it has been modified or installed.  Access to a-network may be denied when the modification itself materially and-adversely affects the operation of the network or violates the rules and-protocols for communication across the network.--  Corresponding Source conveyed, and Installation Information provided,-in accord with this section must be in a format that is publicly-documented (and with an implementation available to the public in-source code form), and must require no special password or key for-unpacking, reading or copying.--  7. Additional Terms.--  "Additional permissions" are terms that supplement the terms of this-License by making exceptions from one or more of its conditions.-Additional permissions that are applicable to the entire Program shall-be treated as though they were included in this License, to the extent-that they are valid under applicable law.  If additional permissions-apply only to part of the Program, that part may be used separately-under those permissions, but the entire Program remains governed by-this License without regard to the additional permissions.--  When you convey a copy of a covered work, you may at your option-remove any additional permissions from that copy, or from any part of-it.  (Additional permissions may be written to require their own-removal in certain cases when you modify the work.)  You may place-additional permissions on material, added by you to a covered work,-for which you have or can give appropriate copyright permission.--  Notwithstanding any other provision of this License, for material you-add to a covered work, you may (if authorized by the copyright holders of-that material) supplement the terms of this License with terms:--    a) Disclaiming warranty or limiting liability differently from the-    terms of sections 15 and 16 of this License; or--    b) Requiring preservation of specified reasonable legal notices or-    author attributions in that material or in the Appropriate Legal-    Notices displayed by works containing it; or--    c) Prohibiting misrepresentation of the origin of that material, or-    requiring that modified versions of such material be marked in-    reasonable ways as different from the original version; or--    d) Limiting the use for publicity purposes of names of licensors or-    authors of the material; or--    e) Declining to grant rights under trademark law for use of some-    trade names, trademarks, or service marks; or--    f) Requiring indemnification of licensors and authors of that-    material by anyone who conveys the material (or modified versions of-    it) with contractual assumptions of liability to the recipient, for-    any liability that these contractual assumptions directly impose on-    those licensors and authors.--  All other non-permissive additional terms are considered "further-restrictions" within the meaning of section 10.  If the Program as you-received it, or any part of it, contains a notice stating that it is-governed by this License along with a term that is a further-restriction, you may remove that term.  If a license document contains-a further restriction but permits relicensing or conveying under this-License, you may add to a covered work material governed by the terms-of that license document, provided that the further restriction does-not survive such relicensing or conveying.--  If you add terms to a covered work in accord with this section, you-must place, in the relevant source files, a statement of the-additional terms that apply to those files, or a notice indicating-where to find the applicable terms.--  Additional terms, permissive or non-permissive, may be stated in the-form of a separately written license, or stated as exceptions;-the above requirements apply either way.--  8. Termination.--  You may not propagate or modify a covered work except as expressly-provided under this License.  Any attempt otherwise to propagate or-modify it is void, and will automatically terminate your rights under-this License (including any patent licenses granted under the third-paragraph of section 11).--  However, if you cease all violation of this License, then your-license from a particular copyright holder is reinstated (a)-provisionally, unless and until the copyright holder explicitly and-finally terminates your license, and (b) permanently, if the copyright-holder fails to notify you of the violation by some reasonable means-prior to 60 days after the cessation.--  Moreover, your license from a particular copyright holder is-reinstated permanently if the copyright holder notifies you of the-violation by some reasonable means, this is the first time you have-received notice of violation of this License (for any work) from that-copyright holder, and you cure the violation prior to 30 days after-your receipt of the notice.--  Termination of your rights under this section does not terminate the-licenses of parties who have received copies or rights from you under-this License.  If your rights have been terminated and not permanently-reinstated, you do not qualify to receive new licenses for the same-material under section 10.--  9. Acceptance Not Required for Having Copies.--  You are not required to accept this License in order to receive or-run a copy of the Program.  Ancillary propagation of a covered work-occurring solely as a consequence of using peer-to-peer transmission-to receive a copy likewise does not require acceptance.  However,-nothing other than this License grants you permission to propagate or-modify any covered work.  These actions infringe copyright if you do-not accept this License.  Therefore, by modifying or propagating a-covered work, you indicate your acceptance of this License to do so.--  10. Automatic Licensing of Downstream Recipients.--  Each time you convey a covered work, the recipient automatically-receives a license from the original licensors, to run, modify and-propagate that work, subject to this License.  You are not responsible-for enforcing compliance by third parties with this License.--  An "entity transaction" is a transaction transferring control of an-organization, or substantially all assets of one, or subdividing an-organization, or merging organizations.  If propagation of a covered-work results from an entity transaction, each party to that-transaction who receives a copy of the work also receives whatever-licenses to the work the party's predecessor in interest had or could-give under the previous paragraph, plus a right to possession of the-Corresponding Source of the work from the predecessor in interest, if-the predecessor has it or can get it with reasonable efforts.--  You may not impose any further restrictions on the exercise of the-rights granted or affirmed under this License.  For example, you may-not impose a license fee, royalty, or other charge for exercise of-rights granted under this License, and you may not initiate litigation-(including a cross-claim or counterclaim in a lawsuit) alleging that-any patent claim is infringed by making, using, selling, offering for-sale, or importing the Program or any portion of it.--  11. Patents.--  A "contributor" is a copyright holder who authorizes use under this-License of the Program or a work on which the Program is based.  The-work thus licensed is called the contributor's "contributor version".--  A contributor's "essential patent claims" are all patent claims-owned or controlled by the contributor, whether already acquired or-hereafter acquired, that would be infringed by some manner, permitted-by this License, of making, using, or selling its contributor version,-but do not include claims that would be infringed only as a-consequence of further modification of the contributor version.  For-purposes of this definition, "control" includes the right to grant-patent sublicenses in a manner consistent with the requirements of-this License.--  Each contributor grants you a non-exclusive, worldwide, royalty-free-patent license under the contributor's essential patent claims, to-make, use, sell, offer for sale, import and otherwise run, modify and-propagate the contents of its contributor version.--  In the following three paragraphs, a "patent license" is any express-agreement or commitment, however denominated, not to enforce a patent-(such as an express permission to practice a patent or covenant not to-sue for patent infringement).  To "grant" such a patent license to a-party means to make such an agreement or commitment not to enforce a-patent against the party.--  If you convey a covered work, knowingly relying on a patent license,-and the Corresponding Source of the work is not available for anyone-to copy, free of charge and under the terms of this License, through a-publicly available network server or other readily accessible means,-then you must either (1) cause the Corresponding Source to be so-available, or (2) arrange to deprive yourself of the benefit of the-patent license for this particular work, or (3) arrange, in a manner-consistent with the requirements of this License, to extend the patent-license to downstream recipients.  "Knowingly relying" means you have-actual knowledge that, but for the patent license, your conveying the-covered work in a country, or your recipient's use of the covered work-in a country, would infringe one or more identifiable patents in that-country that you have reason to believe are valid.--  If, pursuant to or in connection with a single transaction or-arrangement, you convey, or propagate by procuring conveyance of, a-covered work, and grant a patent license to some of the parties-receiving the covered work authorizing them to use, propagate, modify-or convey a specific copy of the covered work, then the patent license-you grant is automatically extended to all recipients of the covered-work and works based on it.--  A patent license is "discriminatory" if it does not include within-the scope of its coverage, prohibits the exercise of, or is-conditioned on the non-exercise of one or more of the rights that are-specifically granted under this License.  You may not convey a covered-work if you are a party to an arrangement with a third party that is-in the business of distributing software, under which you make payment-to the third party based on the extent of your activity of conveying-the work, and under which the third party grants, to any of the-parties who would receive the covered work from you, a discriminatory-patent license (a) in connection with copies of the covered work-conveyed by you (or copies made from those copies), or (b) primarily-for and in connection with specific products or compilations that-contain the covered work, unless you entered into that arrangement,-or that patent license was granted, prior to 28 March 2007.--  Nothing in this License shall be construed as excluding or limiting-any implied license or other defenses to infringement that may-otherwise be available to you under applicable patent law.--  12. No Surrender of Others' Freedom.--  If conditions are imposed on you (whether by court order, agreement or-otherwise) that contradict the conditions of this License, they do not-excuse you from the conditions of this License.  If you cannot convey a-covered work so as to satisfy simultaneously your obligations under this-License and any other pertinent obligations, then as a consequence you may-not convey it at all.  For example, if you agree to terms that obligate you-to collect a royalty for further conveying from those to whom you convey-the Program, the only way you could satisfy both those terms and this-License would be to refrain entirely from conveying the Program.--  13. Use with the GNU Affero General Public License.--  Notwithstanding any other provision of this License, you have-permission to link or combine any covered work with a work licensed-under version 3 of the GNU Affero General Public License into a single-combined work, and to convey the resulting work.  The terms of this-License will continue to apply to the part which is the covered work,-but the special requirements of the GNU Affero General Public License,-section 13, concerning interaction through a network will apply to the-combination as such.--  14. Revised Versions of this License.--  The Free Software Foundation may publish revised and/or new versions of-the GNU General Public License from time to time.  Such new versions will-be similar in spirit to the present version, but may differ in detail to-address new problems or concerns.--  Each version is given a distinguishing version number.  If the-Program specifies that a certain numbered version of the GNU General-Public License "or any later version" applies to it, you have the-option of following the terms and conditions either of that numbered-version or of any later version published by the Free Software-Foundation.  If the Program does not specify a version number of the-GNU General Public License, you may choose any version ever published-by the Free Software Foundation.--  If the Program specifies that a proxy can decide which future-versions of the GNU General Public License can be used, that proxy's-public statement of acceptance of a version permanently authorizes you-to choose that version for the Program.--  Later license versions may give you additional or different-permissions.  However, no additional obligations are imposed on any-author or copyright holder as a result of your choosing to follow a-later version.--  15. Disclaimer of Warranty.--  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.--  16. Limitation of Liability.--  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF-SUCH DAMAGES.--  17. Interpretation of Sections 15 and 16.--  If the disclaimer of warranty and limitation of liability provided-above cannot be given local legal effect according to their terms,-reviewing courts shall apply local law that most closely approximates-an absolute waiver of all civil liability in connection with the-Program, unless a warranty or assumption of liability accompanies a-copy of the Program in return for a fee.--                     END OF TERMS AND CONDITIONS--            How to Apply These Terms to Your New Programs--  If you develop a new program, and you want it to be of the greatest-possible use to the public, the best way to achieve this is to make it-free software which everyone can redistribute and change under these terms.--  To do so, attach the following notices to the program.  It is safest-to attach them to the start of each source file to most effectively-state the exclusion of warranty; and each file should have at least-the "copyright" line and a pointer to where the full notice is found.--    <one line to give the program's name and a brief idea of what it does.>-    Copyright (C) <year>  <name of author>--    This program is free software: you can redistribute it and/or modify-    it under the terms of the GNU General Public License as published by-    the Free Software Foundation, either version 3 of the License, or-    (at your option) any later version.--    This program is distributed in the hope that it will be useful,-    but WITHOUT ANY WARRANTY; without even the implied warranty of-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the-    GNU General Public License for more details.--    You should have received a copy of the GNU General Public License-    along with this program.  If not, see <http://www.gnu.org/licenses/>.--Also add information on how to contact you by electronic and paper mail.--  If the program does terminal interaction, make it output a short-notice like this when it starts in an interactive mode:--    <program>  Copyright (C) <year>  <name of author>-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.-    This is free software, and you are welcome to redistribute it-    under certain conditions; type `show c' for details.+Copyright (c) 2010 John Millikin -The hypothetical commands `show w' and `show c' should show the appropriate-parts of the General Public License.  Of course, your program's commands-might be different; for a GUI interface, you would use an "about box".+Permission is hereby granted, free of charge, to any person+obtaining a copy of this software and associated documentation+files (the "Software"), to deal in the Software without+restriction, including without limitation the rights to use,+copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the+Software is furnished to do so, subject to the following+conditions: -  You should also get your employer (if you work as a programmer) or school,-if any, to sign a "copyright disclaimer" for the program, if necessary.-For more information on this, and how to apply and follow the GNU GPL, see-<http://www.gnu.org/licenses/>.+The above copyright notice and this permission notice shall be+included in all copies or substantial portions of the Software. -  The GNU General Public License does not permit incorporating your program-into proprietary programs.  If your program is a subroutine library, you-may consider it more useful to permit linking proprietary applications with-the library.  If this is what you want to do, use the GNU Lesser General-Public License instead of this License.  But first, please read-<http://www.gnu.org/philosophy/why-not-lgpl.html>.+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR+OTHER DEALINGS IN THE SOFTWARE.

@@ -1,24 +1,18 @@-{--  Copyright (C) 2009 John Millikin <jmillikin@gmail.com>-  -  This program is free software: you can redistribute it and/or modify-  it under the terms of the GNU General Public License as published by-  the Free Software Foundation, either version 3 of the License, or-  any later version.-  -  This program is distributed in the hope that it will be useful,-  but WITHOUT ANY WARRANTY; without even the implied warranty of-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the-  GNU General Public License for more details.-  -  You should have received a copy of the GNU General Public License-  along with this program.  If not, see <http://www.gnu.org/licenses/>.--}--module Main () where+-----------------------------------------------------------------------------+-- |+-- Module: Tests+-- Copyright: 2010 John Millikin+-- License: MIT+--+-- Maintainer: jmillikin@gmail.com+-- Portability: portable+--+-----------------------------------------------------------------------------+module Main (tests, main) where  import Test.QuickCheck-import Test.QuickCheck.Batch+import qualified Test.Framework as F+import Test.Framework.Providers.QuickCheck2 (testProperty)  import qualified Data.ByteString.Lazy as B import Data.Word (Word8)@@ -27,37 +21,40 @@  import Data.Binary.IEEE754 -runOnce = TestOptions-	{ no_of_tests     = 1-	, length_of_tests = 1-	, debug_tests     = False-	}--runDeep = TestOptions-	{ no_of_tests     = 1000-	, length_of_tests = 0-	, debug_tests     = False-	}--main = do-	runTests "parsing" runOnce . map (run . property) . concat $-		[ props_GetFloat16-		, props_GetFloat32-		, props_GetFloat64+tests :: [F.Test]+tests =+	[ F.testGroup "parsing"+		[ props_GetFloat16 "16"+		, props_GetFloat32 "32"+		, props_GetFloat64 "64" 		]-	runTests "serialising" runOnce . map (run . property) . concat $-		[ props_PutFloat32-		, props_PutFloat64+	, F.testGroup "serialising"+		[ props_PutFloat32 "32"+		, props_PutFloat64 "64" 		]-	runTests "passthrough" runDeep . map run $-		[ property $ passthrough putFloat32le getFloat32le-		, property $ passthrough putFloat32be getFloat32be-		, property $ passthrough putFloat64le getFloat64le-		, property $ passthrough putFloat64be getFloat64be+	, F.testGroup "passthrough"+		[ testPassthrough "32-le" putFloat32le getFloat32le+		, testPassthrough "32-be" putFloat32be getFloat32be+		, testPassthrough "64-le" putFloat64le getFloat64le+		, testPassthrough "64-be" putFloat64be getFloat64be 		]+	, F.testGroup "passthrough NaN"+		[ testPassthroughNaN "32-le" putFloat32le getFloat32le+		, testPassthroughNaN "32-be" putFloat32be getFloat32be+		, testPassthroughNaN "64-le" putFloat64le getFloat64le+		, testPassthroughNaN "64-be" putFloat64be getFloat64be+		]+	] -props_GetFloat16 = let check = checkGet getFloat16be getFloat16le in-	[ check [0, 0]    (and' (== 0.0) (not . isNegativeZero))+main :: IO ()+main = F.defaultMain tests++props_GetFloat16 :: String -> F.Test+props_GetFloat16 label =+	let check = checkGet getFloat16be getFloat16le in+	F.testGroup label+	+	[ check [0, 0]    ((== 0.0) .&& (not . isNegativeZero)) 	, check [0x80, 0] isNegativeZero 	 	-- Normalised@@ -73,12 +70,16 @@ 	, check [0xFC, 0] (== -inf32) 	 	-- NaN-	, check [0x7E, 0] (and' isNaN (not . isNegativeNaN))+	, check [0x7E, 0] (isNaN .&& (not . isNegativeNaN)) 	, check [0xFE, 0] isNegativeNaN 	] -props_GetFloat32 = let check = checkGet getFloat32be getFloat32le in-	[ check [0, 0, 0, 0]    (and' (== 0.0) (not . isNegativeZero))+props_GetFloat32 :: String -> F.Test+props_GetFloat32 label =+	let check = checkGet getFloat32be getFloat32le in+	F.testGroup label+	+	[ check [0, 0, 0, 0]    ((== 0.0) .&& (not . isNegativeZero)) 	, check [0x80, 0, 0, 0] isNegativeZero 	 	-- Normalised@@ -94,12 +95,16 @@ 	, check [0xFF, 0x80, 0, 0] (== -inf32) 	 	-- NaN and negative NaN-	, check [0x7F, 0xC0, 0, 0] (and' isNaN (not . isNegativeNaN))+	, check [0x7F, 0xC0, 0, 0] (isNaN .&& (not . isNegativeNaN)) 	, check [0xFF, 0xC0, 0, 0] isNegativeNaN 	] -props_GetFloat64 = let check = checkGet getFloat64be getFloat64le in-	[ check [0, 0, 0, 0, 0, 0, 0, 0]    (and' (== 0.0) (not . isNegativeZero))+props_GetFloat64 :: String -> F.Test+props_GetFloat64 label =+	let check = checkGet getFloat64be getFloat64le in+	F.testGroup label+	+	[ check [0, 0, 0, 0, 0, 0, 0, 0]    ((== 0.0) .&& (not . isNegativeZero)) 	, check [0x80, 0, 0, 0, 0, 0, 0, 0] isNegativeZero 	 	-- Normalised@@ -115,11 +120,15 @@ 	, check [0xFF, 0xF0, 0, 0, 0, 0, 0, 0] (== -inf64) 	 	-- NaN-	, check [0x7F, 0xF8, 0, 0, 0, 0, 0, 0] (and' isNaN (not . isNegativeNaN))+	, check [0x7F, 0xF8, 0, 0, 0, 0, 0, 0] (isNaN .&& (not . isNegativeNaN)) 	, check [0xFF, 0xF8, 0, 0, 0, 0, 0, 0] isNegativeNaN 	] -props_PutFloat32 = let check = checkPut putFloat32be putFloat32le in+props_PutFloat32 :: String -> F.Test+props_PutFloat32 label =+	let check = checkPut putFloat32be putFloat32le in+	F.testGroup label+	 	[ check [0, 0, 0, 0]   0.0 	, check [0x80, 0, 0, 0] (-0.0) 	@@ -140,7 +149,11 @@ 	, check [0xFF, 0xC0, 0, 0] (-nan32) 	] -props_PutFloat64 = let check = checkPut putFloat64be putFloat64le in+props_PutFloat64 :: String -> F.Test+props_PutFloat64 label =+	let check = checkPut putFloat64be putFloat64le in+	F.testGroup label+	 	[ check [0, 0, 0, 0, 0, 0, 0, 0]      0.0 	, check [0x80, 0, 0, 0, 0, 0, 0, 0] (-0.0) 	@@ -161,31 +174,59 @@ 	, check [0xFF, 0xF8, 0, 0, 0, 0, 0, 0] (-nan64) 	] -checkGet :: (Show a, Eq a, RealFloat a) => Get a -> Get a -> [Word8] -> (a -> Bool) -> Property-checkGet getBE getLE bytes f = forAll (return bytes) (const valid) where+checkGet :: (Show a, Eq a, RealFloat a)+         => Get a -- ^ big endian+         -> Get a -- ^ little endian+         -> [Word8] -- ^ big-endian bytes+         -> (a -> Bool) -- ^ verify result+         -> F.Test+checkGet getBE getLE bytes f = testProperty "get" $ forAll (return bytes) (const valid) where 	valid = B.null remainingBE && B.null remainingLE && f xBE && f xLE 	(xBE, remainingBE, _) = runGetState getBE (B.pack bytes) 0 	(xLE, remainingLE, _) = runGetState getLE (B.pack (reverse bytes)) 0 -checkPut :: Show a => (a -> Put) -> (a -> Put) -> [Word8] -> a -> Property-checkPut putBE putLE bytes x = forAll (return x) (const valid) where+checkPut :: Show a+         => (a -> Put) -- ^ big endian+         -> (a -> Put) -- ^ little endian+         -> [Word8] -- ^ expected big-endian bytes+         -> a+         -> F.Test+checkPut putBE putLE bytes x = testProperty "put" $ forAll (return x) (const valid) where 	valid = sameResult && bytes == B.unpack bytesBE 	sameResult = bytesBE == B.reverse bytesLE 	bytesBE = runPut (putBE x) 	bytesLE = runPut (putLE x) -and' :: (a -> Bool) -> (a -> Bool) -> a -> Bool-and' f g x = f x && g x+(.&&) :: (a -> Bool) -> (a -> Bool) -> a -> Bool+(.&&) f g x = f x && g x  isNegativeNaN :: RealFloat a => a -> Bool-isNegativeNaN x = isNaN x && (floor x > 0)+isNegativeNaN x = isNaN x && frac < 0 where+	(frac, _) = decodeFloat x  -- Verify that the given put and get functions are inverses.-passthrough :: Eq a => (a -> Put) -> Get a -> a -> Bool-passthrough put get x = x == x' && B.null remaining where+testPassthrough :: (Arbitrary a, Show a, Eq a)+                => F.TestName+                -> (a -> Put)+                -> Get a+                -> F.Test+testPassthrough name put get = testProperty name $ \x -> let 	bytes = runPut (put x) 	(x', remaining, _) = runGetState get bytes 0+	in x == x' && B.null remaining +testPassthroughNaN :: (Arbitrary a, RealFloat a, Read a)+                    => F.TestName+                    -> (a -> Put)+                    -> Get a+                    -> F.Test+testPassthroughNaN name put get = testProperty name valid where+	nan = read "NaN"+	test x = decodeFloat x == decodeFloat x' && B.null remaining where+		bytes = runPut (put x)+		(x', remaining, _) = runGetState get bytes 0+	valid = test nan && test (- nan)+ -- Pseudo-literals for special values inf32 :: Float inf32 = read "Infinity"@@ -194,7 +235,7 @@ inf64 = read "Infinity"  nan32 :: Float-nan32 = read "NaN"+nan32 = - (read "NaN")  nan64 :: Double-nan64 = read "NaN"+nan64 = - (read "NaN")

@@ -1,8 +1,8 @@ name: data-binary-ieee754-version: 0.4.1+version: 0.4.2 synopsis: Parser/Serialiser for IEEE-754 floating-point values description: Convert Float and Decimal values to/from raw octets.-license: GPL-3+license: MIT license-file: License.txt author: John Millikin maintainer: jmillikin@gmail.com@@ -12,21 +12,33 @@ stability: experimental bug-reports: mailto:jmillikin@gmail.com homepage: http://ianen.org/haskell/data-binary-ieee754/-tested-with: GHC==6.10.4, GHC==6.12.1--extra-source-files:-  data-binary-ieee754.tex-  Tests.hs+tested-with: GHC==6.12.1  source-repository head   type: darcs   location: http://ianen.org/haskell/data-binary-ieee754/ +flag test+  default: False+ library+  ghc-options: -Wall -fno-warn-unused-do-bind+   build-depends:-      base >=3 && < 5+      base >= 3.0 && < 5     , binary >= 0.4 && < 0.6-    , bytestring >= 0.9 && < 0.10    exposed-modules:     Data.Binary.IEEE754++executable data-binary-ieee754_tests+  main-is: Tests.hs++  if flag(test)+    build-depends:+        QuickCheck >= 2.2 && < 2.3+      , test-framework >= 0.2 && < 0.4+      , test-framework-quickcheck2 >= 0.2 && < 0.3+      , bytestring >= 0.9 && < 0.10+  else+    buildable: False

@@ -1,28 +0,0 @@-\documentclass[12pt]{article}--\usepackage{textcomp}-\usepackage{booktabs}--% Smaller margins-\usepackage[left=1.5cm,top=2cm,right=1.5cm,nohead,nofoot]{geometry}--\usepackage{listings}-\lstnewenvironment{code}{-	\lstset-		{language=Haskell-		,basicstyle=\footnotesize\tt-		,showstringspaces=false-		,frame=single-		,upquote=true-		}}-		{}--\long\def\ignore#1{}--\makeindex--\begin{document}--\input{Data/Binary/IEEE754.lhs}--\end{document}