Rename CTreeExt to XXCTree

Author: Soupstraw

src/Codec/CBOR/Cuddle/CDDL/CTree.hs

@@ -34,7 +34,7 @@ import GHC.Generics (Generic)
 -- to manipulate.
 --------------------------------------------------------------------------------
 
-type family CTreeExt i
+type family XXCTree i
 
 data CTreePhase
 
@@ -67,14 +67,14 @@ data CTree i
   | Enum (CTree i)
   | Unwrap (CTree i)
   | Tag Word64 (CTree i)
-  | CTreeE (CTreeExt i)
+  | CTreeE (XXCTree i)
   deriving (Generic)
 
 deriving instance Eq (Node f) => Eq (CTree f)
 
 -- | Traverse the CTree, carrying out the given operation at each node
 traverseCTree ::
-  Monad m => (CTreeExt i -> m (CTree j)) -> (CTree i -> m (CTree j)) -> CTree i -> m (CTree j)
+  Monad m => (XXCTree i -> m (CTree j)) -> (CTree i -> m (CTree j)) -> CTree i -> m (CTree j)
 traverseCTree _ _ (Literal a) = pure $ Literal a
 traverseCTree _ _ (Postlude a) = pure $ Postlude a
 traverseCTree _ atNode (Map xs) = Map <$> traverse atNode xs
@@ -99,7 +99,7 @@ traverseCTree _ atNode (Unwrap ref) = Unwrap <$> atNode ref
 traverseCTree _ atNode (Tag i ref) = Tag i <$> atNode ref
 traverseCTree atExt _ (CTreeE x) = atExt x
 
-type Node i = CTreeExt i
+type Node i = XXCTree i
 
 newtype CTreeRoot i = CTreeRoot (Map.Map (Name CTreePhase) (CTree i))
   deriving (Generic)

src/Codec/CBOR/Cuddle/CDDL/Resolve.hs

@@ -47,10 +47,10 @@ import Capability.State (HasState, MonadState (..), modify)
 import Codec.CBOR.Cuddle.CDDL as CDDL
 import Codec.CBOR.Cuddle.CDDL.CTree (
   CTree (..),
-  CTreeExt,
   CTreePhase,
   CTreeRoot (..),
   PTerm (..),
+  XXCTree,
   XXType2 (..),
  )
 import Codec.CBOR.Cuddle.CDDL.CTree qualified as CTree
@@ -80,7 +80,7 @@ instance Hashable a => Hashable (ProvidedParameters a)
 
 data Parametrised
 
-type instance CTreeExt Parametrised = ProvidedParameters (CTree Parametrised)
+type instance XXCTree Parametrised = ProvidedParameters (CTree Parametrised)
 
 --------------------------------------------------------------------------------
 -- 1. Rule extensions
@@ -137,7 +137,7 @@ asMap cddl = foldl' go Map.empty rules
 
 data OrReferenced
 
-type instance CTreeExt OrReferenced = OrRef
+type instance XXCTree OrReferenced = OrRef
 
 -- | Indicates that an item may be referenced rather than defined.
 data OrRef
@@ -340,7 +340,7 @@ data BindingEnv i j = BindingEnv
 
 data DistReferenced
 
-type instance CTreeExt DistReferenced = DistRef
+type instance XXCTree DistReferenced = DistRef
 
 data DistRef
   = -- | Reference to a generic parameter
@@ -404,7 +404,7 @@ buildResolvedCTree (PartialCTreeRoot ct) = PartialCTreeRoot <$> traverse go ct
 
 data MonoReferenced
 
-type instance CTreeExt MonoReferenced = MonoRef (CTree MonoReferenced)
+type instance XXCTree MonoReferenced = MonoRef (CTree MonoReferenced)
 
 newtype MonoRef a
   = MRuleRef (Name CTreePhase)