dbus 1.2.11 → 1.2.12
raw patch · 3 files changed
+155/−155 lines, 3 filesdep ~extradep ~lensPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: extra, lens
API changes (from Hackage documentation)
- DBus.Internal.Types: typeOf' :: IsValue a => Proxy a -> Type
+ DBus.Internal.Types: typeOf_ :: IsValue a => Proxy a -> Type
Files
- dbus.cabal +3/−3
- lib/DBus.hs +2/−2
- lib/DBus/Internal/Types.hs +150/−150
dbus.cabal view
@@ -1,6 +1,6 @@ cabal-version: >=1.8 name: dbus-version: 1.2.11+version: 1.2.12 license: Apache-2.0 license-file: license.txt maintainer: Andrey Sverdlichenko <blaze@ruddy.ru>@@ -99,7 +99,7 @@ deepseq <1.5, exceptions <0.11, filepath <1.5,- lens <4.19,+ lens <4.20, network >=3.0.1.0 && <3.2, parsec <3.2, random <1.2,@@ -145,7 +145,7 @@ cereal <0.6, containers <0.7, directory <1.4,- extra <1.7,+ extra <1.8, filepath <1.5, network >=3.0.1.0 && <3.2, parsec <3.2,
lib/DBus.hs view
@@ -180,7 +180,7 @@ import DBus.Internal.Address import DBus.Internal.Message import qualified DBus.Internal.Types-import DBus.Internal.Types hiding (typeOf, typeOf')+import DBus.Internal.Types hiding (typeOf) import DBus.Internal.Wire -- | Deprecated. Get the D-Bus type corresponding to the given Haskell value. The value@@ -190,7 +190,7 @@ -- | Get the D-Bus type corresponding to the given Haskell type 'a'. typeOf' :: IsValue a => Proxy a -> Type-typeOf' = DBus.Internal.Types.typeOf'+typeOf' = DBus.Internal.Types.typeOf_ -- | Construct a new 'MethodCall' for the given object, interface, and method. --
lib/DBus/Internal/Types.hs view
@@ -310,7 +310,7 @@ extractFromVariant v = fromVariant v typeOf :: forall a. IsValue a => a -> Type-typeOf _ = typeOf' (Proxy :: Proxy a)+typeOf _ = typeOf_ (Proxy :: Proxy a) class IsVariant a where toVariant :: a -> Variant@@ -322,7 +322,7 @@ -- Users may not provide new instances of 'IsValue' because this could allow -- containers to be created with items of heterogenous types. class IsVariant a => IsValue a where- typeOf' :: Proxy a -> Type+ typeOf_ :: Proxy a -> Type toValue :: a -> Value fromValue :: Value -> Maybe a @@ -456,7 +456,7 @@ ; fromAtom _ = Nothing \ }; \ instance IsValue HsType where \- { typeOf' _ = TypeCons \+ { typeOf_ _ = TypeCons \ ; toValue = ValueAtom . toAtom \ ; fromValue (ValueAtom x) = fromAtom x \ ; fromValue _ = Nothing \@@ -481,7 +481,7 @@ IS_ATOM(ObjectPath, AtomObjectPath, TypeObjectPath) instance IsValue Variant where- typeOf' _ = TypeVariant+ typeOf_ _ = TypeVariant toValue = ValueVariant fromValue (ValueVariant x) = Just x fromValue _ = Nothing@@ -495,7 +495,7 @@ fromAtom = fmap Data.Text.Lazy.fromStrict . fromAtom instance IsValue Data.Text.Lazy.Text where- typeOf' _ = TypeString+ typeOf_ _ = TypeString toValue = ValueAtom . toAtom fromValue (ValueAtom x) = fromAtom x fromValue _ = Nothing@@ -509,7 +509,7 @@ fromAtom = fmap Data.Text.unpack . fromAtom instance IsValue String where- typeOf' _ = TypeString+ typeOf_ _ = TypeString toValue = ValueAtom . toAtom fromValue (ValueAtom x) = fromAtom x fromValue _ = Nothing@@ -519,9 +519,9 @@ fromVariant (Variant val) = fromValue val instance IsValue a => IsValue (Vector a) where- typeOf' _ = TypeArray (typeOf' (Proxy :: Proxy a))+ typeOf_ _ = TypeArray (typeOf_ (Proxy :: Proxy a)) toValue v = ValueVector- (typeOf' (Proxy :: Proxy a))+ (typeOf_ (Proxy :: Proxy a)) (Data.Vector.map toValue v) fromValue (ValueVector _ v) = Data.Vector.mapM fromValue v fromValue _ = Nothing@@ -531,7 +531,7 @@ fromVariant (Variant val) = fromValue val instance IsValue a => IsValue [a] where- typeOf' _ = TypeArray (typeOf' (Proxy :: Proxy a))+ typeOf_ _ = TypeArray (typeOf_ (Proxy :: Proxy a)) toValue = toValue . Data.Vector.fromList fromValue = fmap Data.Vector.toList . fromValue @@ -540,7 +540,7 @@ fromVariant = fmap Data.Vector.toList . fromVariant instance IsValue BS.ByteString where- typeOf' _ = TypeArray TypeWord8+ typeOf_ _ = TypeArray TypeWord8 toValue = ValueBytes fromValue (ValueBytes bs) = Just bs fromValue (ValueVector TypeWord8 v) = Just (vectorToBytes v)@@ -551,7 +551,7 @@ fromVariant (Variant val) = fromValue val instance IsValue BL.ByteString where- typeOf' _ = TypeArray TypeWord8+ typeOf_ _ = TypeArray TypeWord8 toValue = toValue . BS.concat . BL.toChunks@@ -563,13 +563,13 @@ fromVariant (Variant val) = fromValue val instance (Ord k, IsAtom k, IsValue v) => IsValue (Map k v) where- typeOf' _ = TypeDictionary- (typeOf' (Proxy :: Proxy k))- (typeOf' (Proxy :: Proxy v))+ typeOf_ _ = TypeDictionary+ (typeOf_ (Proxy :: Proxy k))+ (typeOf_ (Proxy :: Proxy v)) toValue m = ValueMap kt vt (bimap box m) where- kt = typeOf' (Proxy :: Proxy k)- vt = typeOf' (Proxy :: Proxy v)+ kt = typeOf_ (Proxy :: Proxy k)+ vt = typeOf_ (Proxy :: Proxy v) box k v = (toAtom k, toValue v) fromValue (ValueMap _ _ m) = bimapM unbox m where@@ -590,7 +590,7 @@ fromVariant (Variant val) = fromValue val instance IsValue () where- typeOf' _ = TypeStructure []+ typeOf_ _ = TypeStructure [] toValue _ = ValueStructure [] fromValue (ValueStructure []) = return () fromValue _ = Nothing@@ -601,9 +601,9 @@ fromVariant _ = Nothing instance (IsValue a1, IsValue a2) => IsValue (a1, a2) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2) ] toValue (a1, a2) = ValueStructure [toValue a1, toValue a2] fromValue (ValueStructure [a1, a2]) = do@@ -912,10 +912,10 @@ return (Variant (ValueAtom k), Variant v) instance (IsValue a1, IsValue a2, IsValue a3) => IsValue (a1, a2, a3) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3) ] toValue (a1, a2, a3) = ValueStructure [toValue a1, toValue a2, toValue a3] fromValue (ValueStructure [a1, a2, a3]) = do@@ -926,11 +926,11 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4) => IsValue (a1, a2, a3, a4) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4) ] toValue (a1, a2, a3, a4) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4] fromValue (ValueStructure [a1, a2, a3, a4]) = do@@ -942,12 +942,12 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5) => IsValue (a1, a2, a3, a4, a5) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5) ] toValue (a1, a2, a3, a4, a5) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5] fromValue (ValueStructure [a1, a2, a3, a4, a5]) = do@@ -960,13 +960,13 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6) => IsValue (a1, a2, a3, a4, a5, a6) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6) ] toValue (a1, a2, a3, a4, a5, a6) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6]) = do@@ -980,14 +980,14 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7) => IsValue (a1, a2, a3, a4, a5, a6, a7) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7) ] toValue (a1, a2, a3, a4, a5, a6, a7) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7]) = do@@ -1002,15 +1002,15 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8]) = do@@ -1026,16 +1026,16 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9]) = do@@ -1052,17 +1052,17 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10]) = do@@ -1080,18 +1080,18 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)- , typeOf' (Proxy :: Proxy a11)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10)+ , typeOf_ (Proxy :: Proxy a11) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11]) = do@@ -1110,19 +1110,19 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)- , typeOf' (Proxy :: Proxy a11)- , typeOf' (Proxy :: Proxy a12)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10)+ , typeOf_ (Proxy :: Proxy a11)+ , typeOf_ (Proxy :: Proxy a12) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12]) = do@@ -1142,20 +1142,20 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)- , typeOf' (Proxy :: Proxy a11)- , typeOf' (Proxy :: Proxy a12)- , typeOf' (Proxy :: Proxy a13)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10)+ , typeOf_ (Proxy :: Proxy a11)+ , typeOf_ (Proxy :: Proxy a12)+ , typeOf_ (Proxy :: Proxy a13) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13]) = do@@ -1176,21 +1176,21 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13, IsValue a14) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)- , typeOf' (Proxy :: Proxy a11)- , typeOf' (Proxy :: Proxy a12)- , typeOf' (Proxy :: Proxy a13)- , typeOf' (Proxy :: Proxy a14)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10)+ , typeOf_ (Proxy :: Proxy a11)+ , typeOf_ (Proxy :: Proxy a12)+ , typeOf_ (Proxy :: Proxy a13)+ , typeOf_ (Proxy :: Proxy a14) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13, toValue a14] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14]) = do@@ -1212,22 +1212,22 @@ fromValue _ = Nothing instance (IsValue a1, IsValue a2, IsValue a3, IsValue a4, IsValue a5, IsValue a6, IsValue a7, IsValue a8, IsValue a9, IsValue a10, IsValue a11, IsValue a12, IsValue a13, IsValue a14, IsValue a15) => IsValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) where- typeOf' _ = TypeStructure- [ typeOf' (Proxy :: Proxy a1)- , typeOf' (Proxy :: Proxy a2)- , typeOf' (Proxy :: Proxy a3)- , typeOf' (Proxy :: Proxy a4)- , typeOf' (Proxy :: Proxy a5)- , typeOf' (Proxy :: Proxy a6)- , typeOf' (Proxy :: Proxy a7)- , typeOf' (Proxy :: Proxy a8)- , typeOf' (Proxy :: Proxy a9)- , typeOf' (Proxy :: Proxy a10)- , typeOf' (Proxy :: Proxy a11)- , typeOf' (Proxy :: Proxy a12)- , typeOf' (Proxy :: Proxy a13)- , typeOf' (Proxy :: Proxy a14)- , typeOf' (Proxy :: Proxy a15)+ typeOf_ _ = TypeStructure+ [ typeOf_ (Proxy :: Proxy a1)+ , typeOf_ (Proxy :: Proxy a2)+ , typeOf_ (Proxy :: Proxy a3)+ , typeOf_ (Proxy :: Proxy a4)+ , typeOf_ (Proxy :: Proxy a5)+ , typeOf_ (Proxy :: Proxy a6)+ , typeOf_ (Proxy :: Proxy a7)+ , typeOf_ (Proxy :: Proxy a8)+ , typeOf_ (Proxy :: Proxy a9)+ , typeOf_ (Proxy :: Proxy a10)+ , typeOf_ (Proxy :: Proxy a11)+ , typeOf_ (Proxy :: Proxy a12)+ , typeOf_ (Proxy :: Proxy a13)+ , typeOf_ (Proxy :: Proxy a14)+ , typeOf_ (Proxy :: Proxy a15) ] toValue (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) = ValueStructure [toValue a1, toValue a2, toValue a3, toValue a4, toValue a5, toValue a6, toValue a7, toValue a8, toValue a9, toValue a10, toValue a11, toValue a12, toValue a13, toValue a14, toValue a15] fromValue (ValueStructure [a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15]) = do