♻️ Rename BasicUnifiedPrim to UnifiedBasicPrim

grisette.cabal

@@ -216,7 +216,6 @@ library
       Grisette.Unified.Internal.UnifiedAlgReal
       Grisette.Unified.Internal.UnifiedBool
       Grisette.Unified.Internal.UnifiedBV
-      Grisette.Unified.Internal.UnifiedConstraint
       Grisette.Unified.Internal.UnifiedData
       Grisette.Unified.Internal.UnifiedFP
       Grisette.Unified.Internal.UnifiedFun

src/Grisette/Unified.hs

@@ -117,7 +117,7 @@ module Grisette.Unified
 
     -- ** Shared constraints
     UnifiedPrim,
-    BasicUnifiedPrim,
+    UnifiedBasicPrim,
 
     -- * Unified types
 
@@ -346,6 +346,6 @@ import Grisette.Unified.Internal.UnifiedInteger
     UnifiedInteger,
   )
 import Grisette.Unified.Internal.UnifiedPrim
-  ( BasicUnifiedPrim,
+  ( UnifiedBasicPrim,
     UnifiedPrim,
   )

src/Grisette/Unified/Internal/EvalMode.hs

@@ -48,14 +48,14 @@ import Grisette.Unified.Internal.Theories
 import Grisette.Unified.Internal.UnifiedAlgReal (UnifiedAlgReal)
 import Grisette.Unified.Internal.UnifiedBV (AllUnifiedBV)
 import Grisette.Unified.Internal.UnifiedBool (UnifiedBool (GetBool))
-import Grisette.Unified.Internal.UnifiedConstraint (UnifiedPrimitive)
 import Grisette.Unified.Internal.UnifiedData (AllUnifiedData)
 import Grisette.Unified.Internal.UnifiedFP (AllUnifiedFP)
 import Grisette.Unified.Internal.UnifiedFun
   ( genUnifiedFunInstance,
     unifiedFunInstanceName,
   )
 import Grisette.Unified.Internal.UnifiedInteger (UnifiedInteger)
+import Grisette.Unified.Internal.UnifiedPrim (UnifiedBasicPrim)
 import Language.Haskell.TH
   ( DecsQ,
     Type (AppT, ArrowT, ConT, StarT, VarT),
@@ -78,7 +78,7 @@ import Language.Haskell.TH
 class
   ( Typeable mode,
     UnifiedBool mode,
-    UnifiedPrimitive mode (GetBool mode),
+    UnifiedBasicPrim mode (GetBool mode),
     Monad (BaseMonad mode),
     TryMerge (BaseMonad mode),
     UnifiedBranching mode (BaseMonad mode),

src/Grisette/Unified/Internal/UnifiedAlgReal.hs

@@ -27,7 +27,6 @@ import Grisette.Internal.Core.Data.Class.SafeFdiv (FdivOr)
 import Grisette.Internal.SymPrim.AlgReal (AlgReal)
 import Grisette.Internal.SymPrim.SymAlgReal (SymAlgReal)
 import Grisette.Internal.SymPrim.SymPrim (Prim)
-import Grisette.Unified.Internal.BaseConstraint (ConSymConversion)
 import Grisette.Unified.Internal.Class.UnifiedFromIntegral (UnifiedFromIntegral)
 import Grisette.Unified.Internal.Class.UnifiedRep
   ( UnifiedConRep (ConType),
@@ -37,17 +36,16 @@ import Grisette.Unified.Internal.Class.UnifiedSafeFdiv (UnifiedSafeFdiv)
 import Grisette.Unified.Internal.Class.UnifiedSimpleMergeable (UnifiedBranching)
 import Grisette.Unified.Internal.EvalModeTag (EvalModeTag (C, S))
 import Grisette.Unified.Internal.UnifiedInteger (GetInteger)
-import Grisette.Unified.Internal.UnifiedPrim (BasicUnifiedPrim)
+import Grisette.Unified.Internal.UnifiedPrim (UnifiedBasicPrim)
 
 class
   ( r ~ GetAlgReal mode,
     UnifiedConRep r,
     UnifiedSymRep r,
     ConType r ~ AlgReal,
     SymType r ~ SymAlgReal,
-    BasicUnifiedPrim mode r,
+    UnifiedBasicPrim mode r,
     Prim r,
-    ConSymConversion AlgReal SymAlgReal r,
     Num r,
     Fractional r,
     FdivOr r,

src/Grisette/Unified/Internal/UnifiedBV.hs

@@ -79,7 +79,7 @@ import Grisette.Unified.Internal.Class.UnifiedSimpleMergeable
 import Grisette.Unified.Internal.EvalModeTag (EvalModeTag (C, S))
 import Grisette.Unified.Internal.UnifiedAlgReal (GetAlgReal)
 import Grisette.Unified.Internal.UnifiedInteger (GetInteger)
-import Grisette.Unified.Internal.UnifiedPrim (BasicUnifiedPrim, UnifiedPrim)
+import Grisette.Unified.Internal.UnifiedPrim (UnifiedBasicPrim, UnifiedPrim)
 
 type BVConstraint mode word int =
   ( Num word,
@@ -119,8 +119,8 @@ class
     SymType word ~ SymWordN n,
     ConType int ~ IntN n,
     SymType int ~ SymIntN n,
-    BasicUnifiedPrim mode word,
-    BasicUnifiedPrim mode int,
+    UnifiedBasicPrim mode word,
+    UnifiedBasicPrim mode int,
     BVConstraint mode word int,
     wordn ~ GetWordN mode,
     intn ~ GetIntN mode,

src/Grisette/Unified/Internal/UnifiedFP.hs

@@ -46,15 +46,15 @@ import Grisette.Unified.Internal.Class.UnifiedSimpleMergeable (UnifiedBranching)
 import Grisette.Unified.Internal.EvalModeTag (EvalModeTag (C, S))
 import Grisette.Unified.Internal.UnifiedAlgReal (GetAlgReal)
 import Grisette.Unified.Internal.UnifiedInteger (GetInteger)
-import Grisette.Unified.Internal.UnifiedPrim (BasicUnifiedPrim)
+import Grisette.Unified.Internal.UnifiedPrim (UnifiedBasicPrim)
 
 -- | Implementation for 'UnifiedFP'.
 class
   ( UnifiedConRep fp,
     UnifiedSymRep fp,
     ConType fp ~ FP eb sb,
     SymType fp ~ SymFP eb sb,
-    BasicUnifiedPrim mode fp,
+    UnifiedBasicPrim mode fp,
     Floating fp,
     SymIEEEFPTraits fp,
     IEEEFPConstants fp,

src/Grisette/Unified/Internal/UnifiedInteger.hs

@@ -38,15 +38,15 @@ import Grisette.Unified.Internal.Class.UnifiedSafeLinearArith
   )
 import Grisette.Unified.Internal.Class.UnifiedSimpleMergeable (UnifiedBranching)
 import Grisette.Unified.Internal.EvalModeTag (EvalModeTag (C, S))
-import Grisette.Unified.Internal.UnifiedPrim (BasicUnifiedPrim)
+import Grisette.Unified.Internal.UnifiedPrim (UnifiedBasicPrim)
 
 class
   ( i ~ GetInteger mode,
     UnifiedConRep i,
     UnifiedSymRep i,
     ConType i ~ Integer,
     SymType i ~ SymInteger,
-    BasicUnifiedPrim mode i,
+    UnifiedBasicPrim mode i,
     Num i,
     forall m.
     (UnifiedBranching mode m, MonadError ArithException m) =>

src/Grisette/Unified/Internal/UnifiedPrim.hs

@@ -15,13 +15,12 @@
 -- Portability :   GHC only
 module Grisette.Unified.Internal.UnifiedPrim
   ( UnifiedPrim,
-    BasicUnifiedPrim,
+    UnifiedBasicPrim,
   )
 where
 
-import Grisette.Internal.Core.Data.Class.ToCon (ToCon)
-import Grisette.Internal.Core.Data.Class.ToSym (ToSym)
 import Grisette.Internal.SymPrim.SymPrim (Prim)
+import Grisette.Unified.Internal.BaseConstraint (ConSymConversion)
 import Grisette.Unified.Internal.Class.UnifiedITEOp
   ( UnifiedITEOp,
   )
@@ -49,14 +48,11 @@ type UnifiedPrim mode a =
 -- types in Grisette.
 --
 -- 'GetSomeWordN' is not considered as a basic (unified) primitive type.
-type BasicUnifiedPrim mode a =
+type UnifiedBasicPrim mode a =
   ( UnifiedPrim mode a,
     UnifiedSimpleMergeable mode a,
     UnifiedConRep a,
     UnifiedSymRep a,
     UnifiedSolvable mode a (ConType a),
-    ToCon a (ConType a),
-    ToSym a (SymType a),
-    ToCon (SymType a) a,
-    ToSym (ConType a) a
+    ConSymConversion (ConType a) (SymType a) a
   )