a303945 · typeable/aeson

git.iko.soy/typeable/aeson

on master help sign in

Merge pull request #169 from maxpow4h/master

a303945Bryan O'Sullivan13 years ago

Data/Aeson/Types/Internal.hs+2−1

@@ -45,6 +45,7 @@ import Control.Monad

45import Control.DeepSeq (NFData(..))

46import Data.Scientific (Scientific)

47import Data.Hashable (Hashable(..))

48+import Data.Data (Data)

48import Data.HashMap.Strict (HashMap)

49import Data.HashMap.Strict (HashMap)

49import Data.Monoid (Monoid(..))

50import Data.Monoid (Monoid(..))

50import Data.String (IsString(..))

51import Data.String (IsString(..))

@@ -174,7 +175,7 @@ data Value = Object !Object

174 | Number !Scientific

175 | Number !Scientific

175 | Bool !Bool

176 | Bool !Bool

176 | Null

177 | Null

177− deriving (Eq, Show, Typeable)

178+ deriving (Eq, Show, Typeable, Data)

178

179

179-- | A newtype wrapper for 'UTCTime' that uses the same non-standard

180-- | A newtype wrapper for 'UTCTime' that uses the same non-standard

180-- serialization format as Microsoft .NET, whose @System.DateTime@

181-- serialization format as Microsoft .NET, whose @System.DateTime@