tweaks

src/Binrep/BLen.hs

@@ -34,6 +34,7 @@ import Data.Void
 import Data.ByteString qualified as B
 import Data.Word
 import Data.Int
+import Binrep.Util.ByteOrder
 
 import Data.Monoid ( Sum(..) )
 import GHC.Generics
@@ -104,6 +105,8 @@ deriving via ViaCBLen Word32 instance BLen Word32
 deriving via ViaCBLen  Int32 instance BLen  Int32
 deriving via ViaCBLen Word64 instance BLen Word64
 deriving via ViaCBLen  Int64 instance BLen  Int64
+deriving via ViaCBLen (ByteOrdered end a)
+    instance KnownNat (CBLen a) => BLen (ByteOrdered end a)
 
 --------------------------------------------------------------------------------
 

src/Binrep/CBLen.hs

@@ -1,11 +1,11 @@
-{-# LANGUAGE UndecidableInstances #-} -- for 'WithCBLen'
-{-# LANGUAGE AllowAmbiguousTypes #-} -- for 'cblen'
+{-# LANGUAGE UndecidableInstances #-} -- for nested type families
 
 module Binrep.CBLen where
 
 import GHC.TypeNats
 import Data.Word
 import Data.Int
+import Binrep.Util.ByteOrder
 
 class IsCBLen a where type CBLen a :: Natural
 
@@ -21,3 +21,6 @@ instance IsCBLen Word32 where type CBLen Word32 = 2^2
 instance IsCBLen  Int32 where type CBLen  Int32 = 2^2
 instance IsCBLen Word64 where type CBLen Word64 = 2^3
 instance IsCBLen  Int64 where type CBLen  Int64 = 2^3
+
+instance IsCBLen a => IsCBLen (ByteOrdered end a) where
+    type CBLen (ByteOrdered end a) = CBLen a

test/ArbitraryOrphans.hs

@@ -3,9 +3,9 @@
 module ArbitraryOrphans() where
 
 import Test.QuickCheck ( Arbitrary )
-import Binrep.Type.Int
-import Data.Kind
+import Binrep.Util.ByteOrder ( ByteOrdered(..) )
+import Data.Kind ( Type )
 
 -- TODO 2023-01-26 raehik: why does the following crash GHC
-deriving via (a :: Type) instance Arbitrary a => Arbitrary (Endian end a)
+deriving via (a :: Type) instance Arbitrary a => Arbitrary (ByteOrdered end a)
 --deriving newtype instance Arbitrary a => Arbitrary (Endian end a)

test/Binrep/LawsSpec.hs

@@ -11,10 +11,7 @@ import ArbitraryOrphans()
 
 import Binrep
 import Binrep.Generic ( nullTermCstrPfxTag )
-import Binrep.BLen.Simple ( blenGenericNonSum, blenGenericSum )
-import Binrep.Type.Int
-import Binrep.Type.Common ( Endianness(..) )
-import Binrep.Type.NullTerminated
+import Binrep.Util.ByteOrder
 import Data.Word
 import Data.ByteString qualified as B
 import GHC.Generics ( Generic )
@@ -33,8 +30,8 @@ spec = do
 --------------------------------------------------------------------------------
 
 type W1   = Word8
-type W2LE = Endian 'LE Word16
-type W8BE = Endian 'BE Word64
+type W2LE = ByteOrdered LE Word16
+type W8BE = ByteOrdered BE Word64
 
 data D
   = D01Bla     Word8 W1 W8BE