update generic-data-functions

Much cleaner interface.

binrep.cabal

@@ -90,7 +90,8 @@ library
     , bytezap
     , deepseq >=1.4.6.1 && <1.6
     , flatparse >=0.5.0.2 && <0.6
-    , generic-data-functions >=0.3.0 && <0.4
+    , generic-data-asserts >=0.1.0 && <0.2
+    , generic-data-functions >=0.4.0 && <0.5
     , megaparsec >=9.2.0 && <9.7
     , parser-combinators >=1.3.0 && <1.4
     , primitive >=0.8.0.0 && <0.10.0.0
@@ -138,7 +139,8 @@ test-suite spec
     , bytezap
     , deepseq >=1.4.6.1 && <1.6
     , flatparse >=0.5.0.2 && <0.6
-    , generic-data-functions >=0.3.0 && <0.4
+    , generic-data-asserts >=0.1.0 && <0.2
+    , generic-data-functions >=0.4.0 && <0.5
     , generic-random >=1.5.0.1 && <1.6
     , hspec >=2.7 && <2.12
     , megaparsec >=9.2.0 && <9.7
@@ -184,7 +186,8 @@ benchmark bench
     , deepseq >=1.4.6.1 && <1.6
     , flatparse >=0.5.0.2 && <0.6
     , gauge
-    , generic-data-functions >=0.3.0 && <0.4
+    , generic-data-asserts >=0.1.0 && <0.2
+    , generic-data-functions >=0.4.0 && <0.5
     , megaparsec >=9.2.0 && <9.7
     , parser-combinators >=1.3.0 && <1.4
     , primitive >=0.8.0.0 && <0.10.0.0

flake.nix

@@ -11,6 +11,8 @@
     strongweak.flake = false;
     generic-data-functions.url   = "github:raehik/generic-data-functions";
     generic-data-functions.flake = false;
+    generic-data-asserts.url   = "github:raehik/generic-data-asserts";
+    generic-data-asserts.flake = false;
   };
   outputs = inputs:
   let
@@ -37,6 +39,7 @@
           packages.flatparse.source = inputs.flatparse;
           packages.strongweak.source = inputs.strongweak;
           packages.generic-data-functions.source = inputs.generic-data-functions;
+          packages.generic-data-asserts.source = inputs.generic-data-asserts;
           devShell = nondevDevShell "ghc98";
         };
         haskellProjects.ghc96 = {
@@ -45,6 +48,7 @@
           packages.flatparse.source = inputs.flatparse;
           packages.strongweak.source = inputs.strongweak;
           packages.generic-data-functions.source = inputs.generic-data-functions;
+          packages.generic-data-asserts.source = inputs.generic-data-asserts;
           devShell.mkShellArgs.name = "ghc96-binrep";
           devShell.tools = _: {
             haskell-language-server = null; # 2024-03-06: broken
@@ -56,6 +60,7 @@
           packages.flatparse.source = inputs.flatparse;
           packages.strongweak.source = inputs.strongweak;
           packages.generic-data-functions.source = inputs.generic-data-functions;
+          packages.generic-data-asserts.source = inputs.generic-data-asserts;
           devShell = nondevDevShell "ghc94";
         };
         haskellProjects.ghc92 = {
@@ -64,6 +69,7 @@
           packages.flatparse.source = inputs.flatparse;
           packages.strongweak.source = inputs.strongweak;
           packages.generic-data-functions.source = inputs.generic-data-functions;
+          packages.generic-data-asserts.source = inputs.generic-data-asserts;
           devShell = nondevDevShell "ghc92";
         };
       };

package.yaml

@@ -56,7 +56,8 @@ dependencies:
 - bytezap
 - primitive >= 0.8.0.0 && < 0.10.0.0
 - flatparse >= 0.5.0.2 && < 0.6
-- generic-data-functions ^>= 0.3.0
+- generic-data-functions ^>= 0.4.0
+- generic-data-asserts ^>= 0.1.0
 - parser-combinators ^>= 1.3.0
 - bytestring >= 0.11 && < 0.13
 - strongweak ^>= 0.6.0

src/Binrep/BLen.hs

@@ -59,11 +59,11 @@ instance GenericFoldMap BLen where
 -- | Measure the byte length of a term of the non-sum type @a@ via its 'Generic'
 --   instance.
 blenGenericNonSum
-    :: forall {cd} {gf} {asserts} a
-    .  ( Generic a, Rep a ~ D1 cd gf, GFoldMapNonSum BLen gf
-       , asserts ~ '[ 'NoEmpty, 'NoSum], ApplyGCAsserts asserts gf)
-    => a -> Int
-blenGenericNonSum = Monoid.getSum . genericFoldMapNonSum @asserts @BLen
+    :: forall a
+    .  ( Generic a, GFoldMapNonSum BLen (Rep a)
+       , GAssertNotVoid a, GAssertNotSum a
+    ) => a -> Int
+blenGenericNonSum = Monoid.getSum . genericFoldMapNonSum @BLen
 
 -- | Measure the byte length of a term of the sum type @a@ via its 'Generic'
 --   instance.
@@ -72,12 +72,12 @@ blenGenericNonSum = Monoid.getSum . genericFoldMapNonSum @asserts @BLen
 -- inspecting the reified constructor names. This is regrettably inefficient.
 -- Alas. Do write your own instance if you want better performance!
 blenGenericSum
-    :: forall {cd} {gf} {asserts} a
-    .  (Generic a, Rep a ~ D1 cd gf, GFoldMapSum 'SumOnly BLen gf
-       , asserts ~ '[ 'NoEmpty, 'NeedSum], ApplyGCAsserts asserts gf)
-    => (String -> Int) -> a -> Int
+    :: forall a
+    .  ( Generic a, GFoldMapSum BLen 'SumOnly (Rep a)
+       , GAssertNotVoid a, GAssertSum a
+    ) => (String -> Int) -> a -> Int
 blenGenericSum f =
-    Monoid.getSum . genericFoldMapSum @'SumOnly @asserts @BLen (Monoid.Sum <$> f)
+    Monoid.getSum . genericFoldMapSum @BLen @'SumOnly (Monoid.Sum <$> f)
 
 instance TypeError ENoEmpty => BLen Void where blen = undefined
 instance TypeError ENoSum => BLen (Either a b) where blen = undefined

src/Binrep/Get.hs

@@ -179,19 +179,19 @@ instance GenericTraverseSum Get where
         FP.err $ E 0 $ EGeneric cd $ EGenericSum $ EGenericSumTagNoMatch cstrs ptText
 
 getGenericNonSum
-    :: forall {cd} {gf} {asserts} a
-    .  (Generic a, Rep a ~ D1 cd gf, GTraverseNonSum cd Get gf
-       , asserts ~ '[ 'NoEmpty, 'NoSum], ApplyGCAsserts asserts gf)
-    => Getter a
-getGenericNonSum = genericTraverseNonSum @asserts @Get
+    :: forall a
+    .  (Generic a, GTraverseNonSum Get (Rep a)
+       , GAssertNotVoid a, GAssertNotSum a
+    ) => Getter a
+getGenericNonSum = genericTraverseNonSum @Get
 
 getGenericSum
-    :: forall {cd} {gf} {asserts} pt a
-    .  ( Generic a, Rep a ~ D1 cd gf, GTraverseSum 'SumOnly cd Get gf
+    :: forall pt a
+    .  ( Generic a, GTraverseSum Get 'SumOnly (Rep a)
        , Get pt
-       , asserts ~ '[ 'NoEmpty, 'NeedSum], ApplyGCAsserts asserts gf)
-    => PfxTagCfg pt -> Getter a
-getGenericSum = genericTraverseSum @'SumOnly @asserts @Get
+       , GAssertNotVoid a, GAssertSum a
+    ) => PfxTagCfg pt -> Getter a
+getGenericSum = genericTraverseSum @Get @'SumOnly
 
 instance TypeError ENoEmpty => Get Void where get = undefined
 instance TypeError ENoSum => Get (Either a b) where get = undefined

src/Binrep/Put.hs

@@ -41,23 +41,23 @@ instance GenericFoldMap Put where
 
 -- | Serialize a term of the non-sum type @a@ via its 'Generic' instance.
 putGenericNonSum
-    :: forall {cd} {gf} {asserts} a
-    .  ( Generic a, Rep a ~ D1 cd gf, GFoldMapNonSum Put gf
-       , asserts ~ '[ 'NoEmpty, 'NoSum], ApplyGCAsserts asserts gf)
-    => a -> Putter
-putGenericNonSum = genericFoldMapNonSum @asserts @Put
+    :: forall a
+    .  ( Generic a, GFoldMapNonSum Put (Rep a)
+       , GAssertNotVoid a, GAssertNotSum a
+    ) => a -> Putter
+putGenericNonSum = genericFoldMapNonSum @Put
 
 -- | Serialize a term of the sum type @a@ via its 'Generic' instance.
 --
 -- You must provide a serializer for @a@'s constructors. This is regrettably
 -- inefficient due to having to use 'String's. Alas. Do write your own instance
 -- if you want better performance!
 putGenericSum
-    :: forall {cd} {gf} {asserts} a
-    .  ( Generic a, Rep a ~ D1 cd gf, GFoldMapSum 'SumOnly Put gf
-       , asserts ~ '[ 'NoEmpty, 'NeedSum], ApplyGCAsserts asserts gf)
-    => (String -> Putter) -> a -> Putter
-putGenericSum = genericFoldMapSum @'SumOnly @asserts @Put
+    :: forall a
+    .  ( Generic a, GFoldMapSum Put 'SumOnly (Rep a)
+       , GAssertNotVoid a, GAssertSum a
+    ) => (String -> Putter) -> a -> Putter
+putGenericSum = genericFoldMapSum @Put @'SumOnly
 
 instance Prim' a => Put (ViaPrim a) where
     put = fromStructPoke (sizeOf (undefined :: a)) . putC