haxr 3000.10 → 3000.10.1
raw patch · 3 files changed
+14/−17 lines, 3 filesdep ~base
Dependency ranges changed: base
Files
- CHANGES +4/−0
- Network/XmlRpc/Internals.hs +9/−16
- haxr.cabal +1/−1
CHANGES view
@@ -1,3 +1,7 @@+* 3000.10.1 (10 October 2013)++ - Export XML conversion functions from Network.XmlRpc.Internals+ * 3000.10 (10 October 2013) - Add an "unwrapped" value type that does not wrap the inner value
Network/XmlRpc/Internals.hs view
@@ -26,6 +26,12 @@ parseResponse, parseCall, getField, getFieldMaybe, -- * Converting to XML renderCall, renderResponse,+-- * Converting to and from DTD types+toXRValue, fromXRValue,+toXRMethodCall, fromXRMethodCall,+toXRMethodResponse, fromXRMethodResponse,+toXRParams, fromXRParams,+toXRMember, fromXRMember, -- * Error monad Err, maybeToM, handleError, ioErrorToErr ) where@@ -33,8 +39,6 @@ import Control.Exception import Control.Monad import Control.Monad.Error-import Control.Monad.Identity-import Data.Char (chr, ord) import Data.Char import Data.List import Data.Maybe@@ -43,9 +47,8 @@ import Data.Time.Calendar.WeekDate (toWeekDate) import Data.Time.Format import Data.Time.LocalTime-import Data.Word (Word8) import Numeric (showFFloat)-import Prelude hiding (showString, catch)+import Prelude hiding (showString) import System.IO.Unsafe (unsafePerformIO) import System.Locale import System.Time (CalendarTime(..))@@ -91,6 +94,7 @@ eitherToM _ (Right x) = return x -- | The format for \"dateTime.iso8601\"+xmlRpcDateFormat :: String xmlRpcDateFormat = "%Y%m%dT%H:%M:%S" --@@ -124,17 +128,6 @@ [x] -> return x _ -> fail (err ++ ": '" ++ s ++ "'") --- | Convert an 'Int' to some instance of 'Enum', and fail if the--- 'Int' is out of range.-errorToEnum :: (Monad m, Bounded a, Enum a) =>- String -- ^ Error message- -> Int- -> Err m a-errorToEnum err x | x < fromEnum (minBound `asTypeOf` r) = fail err- | x > fromEnum (maxBound `asTypeOf` r) = fail err- | otherwise = return r- where r = toEnum x- -- -- Types for methods calls and responses --@@ -316,7 +309,7 @@ toValue xs = ValueStruct [(n, toValue v) | (n,v) <- xs] fromValue v = case v of- ValueStruct xs -> mapM (\ (n,v) -> liftM ((,) n) (fromValue v)) xs+ ValueStruct xs -> mapM (\ (n,v') -> liftM ((,) n) (fromValue v')) xs _ -> typeError v getType _ = TStruct
haxr.cabal view
@@ -1,5 +1,5 @@ Name: haxr-Version: 3000.10+Version: 3000.10.1 Cabal-version: >=1.10 Build-type: Simple Copyright: Bjorn Bringert, 2003-2006