derive 2.5.9 → 2.5.10

raw patch · 5 files changed

+50/−6 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/Derive/All.hs +2/−1
• Data/Derive/Lens.hs +41/−0
• Data/Derive/Typeable.hs +4/−4
• derive.cabal +2/−1
• derive.htm +1/−0

@@ -25,6 +25,7 @@ import Data.Derive.Is                  as D import Data.Derive.JSON                as D import Data.Derive.LazySet             as D+import Data.Derive.Lens                as D import Data.Derive.Monoid              as D import Data.Derive.NFData              as D import Data.Derive.Ord                 as D@@ -40,5 +41,5 @@ import Data.Derive.UniplateTypeable    as D import Data.Derive.Update              as D derivations :: [Derivation]-derivations = [makeArbitrary,makeArbitraryOld,makeArities,makeBinary,makeBinaryDefer,makeBounded,makeData,makeDataAbstract,makeDefault,makeEnum,makeEnumCyclic,makeEq,makeFold,makeFoldable,makeFrom,makeFunctor,makeHas,makeIs,makeJSON,makeLazySet,makeMonoid,makeNFData,makeOrd,makeRead,makeRef,makeSerial,makeSerialize,makeSet,makeShow,makeTraversable,makeTypeable,makeUniplateDirect,makeUniplateTypeable,makeUpdate]+derivations = [makeArbitrary,makeArbitraryOld,makeArities,makeBinary,makeBinaryDefer,makeBounded,makeData,makeDataAbstract,makeDefault,makeEnum,makeEnumCyclic,makeEq,makeFold,makeFoldable,makeFrom,makeFunctor,makeHas,makeIs,makeJSON,makeLazySet,makeLens,makeMonoid,makeNFData,makeOrd,makeRead,makeRef,makeSerial,makeSerialize,makeSet,makeShow,makeTraversable,makeTypeable,makeUniplateDirect,makeUniplateTypeable,makeUpdate] -- GENERATED STOP

@@ -0,0 +1,41 @@+{-|+    A pseudo derivation.  For each field in the data type, deriving+    @Lens@ generates @lens@/FieldName/@ = lens @/fieldName/@+    (\ x v -> v { @/fieldName/@ = x })@.++    This works with the @data-lens@ package.+-}+module Data.Derive.Lens(makeLens) where++{-+import "data-lens" Data.Lens.Common++test :: Sample++test :: Computer++lensSpeed :: Lens Computer Int+lensSpeed = lens speed (\x v -> v{speed = x})++lensWeight :: Lens Computer Double+lensWeight = lens weight (\x v -> v{weight = x})+-}++import Language.Haskell+import Data.Derive.Internal.Derivation+++makeLens :: Derivation+makeLens = derivationCustom "Lens" $ \(_,d) -> Right $ concatMap (makeLensField d) $ dataDeclFields d+++makeLensField :: DataDecl -> String -> [Decl]+makeLensField d field = [TypeSig sl [name ref] typ, bind ref [] bod]+    where+        ref = "lens" ++ title field+        typ = tyApps (tyCon "Lens") [dataDeclType d, fromBangType t]+        Just t = lookup field $ concatMap ctorDeclFields $ dataDeclCtors d++        bod = apps (var "lens")+            [var field+            ,Paren $ Lambda sl [pVar "x",pVar "v"] $ RecUpdate (var "v") [FieldUpdate (qname field) (var "x")]]

@@ -14,13 +14,13 @@  test :: Bool typename_Bool :: TyCon-typename_Bool = mkTyCon "Example.Bool"+typename_Bool = mkTyCon3 "package" "Example" "Bool" instance Typeable Bool where     typeOf _ = mkTyConApp typename_Bool []  test :: Sample typename_Sample :: TyCon-typename_Sample = mkTyCon "Example.Sample"+typename_Sample = mkTyCon3 "package" "Example" "Sample" instance Typeable1 Sample where     typeOf1 _ = mkTyConApp typename_Sample [] instance Typeable a => Typeable (Sample a) where@@ -28,7 +28,7 @@  test :: Either typename_Either :: TyCon-typename_Either = mkTyCon "Example.Either"+typename_Either = mkTyCon3 "package" "Example" "Either" instance Typeable2 Either where     typeOf2 _ = mkTyConApp typename_Either [] instance Typeable a => Typeable1 (Either a) where@@ -77,7 +77,7 @@ mkTypeable modu d =     [TypeSig sl [name fun] (tyCon "TyCon")] ++     [PatBind sl (pVar fun) Nothing (UnGuardedRhs bod) (BDecls []) |-        let bod = App (var "mkTyCon") (Lit $ String $ modu ++ "." ++ nam)] +++        let bod = apps (var "mkTyCon3") [Lit $ String "package", Lit $ String modu, Lit $ String nam]] ++     [inst [] (showN n) [tyCon nam] [PWildCard] $ apps (var "mkTyConApp") [var fun, List []]] ++     [inst [ClassA (qname "Typeable") [v] | v <- tvs] i [TyParen $ tyApp (tyCon nam) tvs] [] $ var $ "typeOf" ++ i ++ "Default"         | (vs,i) <- zip (tail $ inits $ dataDeclVars d) $ map showN [n-1,n-2..]

@@ -1,7 +1,7 @@ cabal-version:  >= 1.6 build-type:     Default name:           derive-version:        2.5.9+version:        2.5.10 build-type:     Simple copyright:      Neil Mitchell 2006-2012 author:         Neil Mitchell <ndmitchell@gmail.com>@@ -79,6 +79,7 @@         Data.Derive.Is         Data.Derive.JSON         Data.Derive.LazySet+        Data.Derive.Lens         Data.Derive.Monoid         Data.Derive.NFData         Data.Derive.Ord

@@ -112,6 +112,7 @@ <li><b><a href='http://hackage.haskell.org/packages/archive/derive/latest/doc/html/Data-Derive-Is.html'>Is</a></b></li> <li><b><a href='http://hackage.haskell.org/packages/archive/json/latest/doc/html/Text-JSON.html#t%3AJSON'>JSON</a></b> - from the library <a href='http://hackage.haskell.org/package/json'>json</a></li> <li><b><a href='http://hackage.haskell.org/packages/archive/derive/latest/doc/html/Data-Derive-LazySet.html'>LazySet</a></b></li>+<li><b><a href='http://hackage.haskell.org/packages/archive/data/lens/doc/html/Data-Lens-Common.html#t%3ALens'>Lens</a></b> - from the library <a href='http://hackage.haskell.org/package/data-lens'>data-lens</a></li> <li><b><a href='http://hackage.haskell.org/packages/archive/base/latest/doc/html/Data-Monoid.html#t%3AMonoid'>Monoid</a></b> - from the library <a href='http://hackage.haskell.org/package/base'>base</a></li> <li><b><a href='http://hackage.haskell.org/packages/archive/deepseq/latest/doc/html/Control-DeepSeq.html#t%3ANFData'>NFData</a></b> - from the library <a href='http://hackage.haskell.org/package/deepseq'>deepseq</a></li> <li><b><a href='http://hackage.haskell.org/packages/archive/base/latest/doc/html/Prelude.html#t%3AOrd'>Ord</a></b> - from the library <a href='http://hackage.haskell.org/package/base'>base</a></li>