⬆️ Upgrade grisette

Author: lsrcz

arith-sum/EvalMode.hs

@@ -8,15 +8,15 @@
 module EvalMode
   ( EvalMode,
     MonadEvalMode,
-    deriveGADTWithEvalMode,
+    deriveWithEvalMode,
     MonadEvalContext,
   )
 where
 
 import Grisette
   ( DeriveConfig (evalModeConfig),
     EvalModeConfig (EvalModeConstraints),
-    deriveGADTWith,
+    deriveWith,
   )
 import Grisette.Lib.Synth.Context (MonadContext)
 import Grisette.Unified
@@ -27,9 +27,9 @@ import Language.Haskell.TH (DecsQ, Name)
 
 genEvalMode "EvalMode" [UBool, UInteger]
 
-deriveGADTWithEvalMode :: [Name] -> [Name] -> DecsQ
-deriveGADTWithEvalMode =
-  deriveGADTWith
+deriveWithEvalMode :: [Name] -> [Name] -> DecsQ
+deriveWithEvalMode =
+  deriveWith
     ( mempty
         { evalModeConfig = [(0, EvalModeConstraints [''EvalMode])]
         }

arith-sum/Operator/Add.hs

@@ -19,7 +19,7 @@ import Grisette
   ( LogicalOp (false),
     PPrint (pformat),
     allClasses0,
-    deriveGADT,
+    derive,
     mrgReturn,
     pprintClasses,
   )
@@ -50,7 +50,7 @@ data Add = Add
 add :: (Add :<: op) => op
 add = inj Add
 
-deriveGADT [''Add] (allClasses0 \\ pprintClasses)
+derive [''Add] (allClasses0 \\ pprintClasses)
 
 instance (MonadContext ctx) => OpTyping Add ctx where
   type OpTypeType Add = DefaultType

arith-sum/Operator/AddImm.hs

@@ -14,7 +14,7 @@ module Operator.AddImm (AddImm (..), addImm) where
 
 import qualified Data.HashSet as HS
 import Data.List ((\\))
-import EvalMode (EvalMode, MonadEvalContext, deriveGADTWithEvalMode)
+import EvalMode (EvalMode, MonadEvalContext, deriveWithEvalMode)
 import Grisette
   ( LogicalOp (false),
     PPrint (pformat),
@@ -53,7 +53,7 @@ newtype AddImm mode = AddImm (GetInteger mode)
 addImm :: (AddImm mode :<: op) => GetInteger mode -> op
 addImm = inj . AddImm
 
-deriveGADTWithEvalMode [''AddImm] (allClasses0 \\ pprintClasses)
+deriveWithEvalMode [''AddImm] (allClasses0 \\ pprintClasses)
 
 instance (MonadEvalContext mode ctx) => OpTyping (AddImm mode) ctx where
   type OpTypeType (AddImm mode) = DefaultType

arith-sum/Operator/Mul.hs

@@ -19,7 +19,7 @@ import Grisette
   ( LogicalOp (false),
     PPrint (pformat),
     allClasses0,
-    deriveGADT,
+    derive,
     mrgReturn,
     pprintClasses,
   )
@@ -50,7 +50,7 @@ data Mul = Mul
 mul :: (Mul :<: op) => op
 mul = inj Mul
 
-deriveGADT [''Mul] (allClasses0 \\ pprintClasses)
+derive [''Mul] (allClasses0 \\ pprintClasses)
 
 instance (MonadContext ctx) => OpTyping Mul ctx where
   type OpTypeType Mul = DefaultType

arith/Arith.hs

@@ -23,7 +23,7 @@ import Grisette
     LogicalOp (false),
     Mergeable,
     PPrint (pformat),
-    deriveGADT,
+    derive,
     mrgReturn,
   )
 import Grisette.Lib.Synth.Context (MonadContext)
@@ -60,7 +60,7 @@ data OpCode
   | Minus
   | UMinus
 
-deriveGADT [''OpCode] [''EvalSym, ''Show, ''Mergeable]
+derive [''OpCode] [''EvalSym, ''Show, ''Mergeable]
 
 -- * Semantics and typing.
 

control/ConProg.hs

@@ -20,7 +20,7 @@ import qualified Data.HashSet as HS
 import Data.List ((\\))
 import qualified Data.Text as T
 import GHC.Generics (Generic)
-import Grisette (PPrint (pformat), allClasses01, deriveGADT, mrgReturn, pprintClasses)
+import Grisette (PPrint (pformat), allClasses01, derive, mrgReturn, pprintClasses)
 import Grisette.Lib.Synth.Context (MonadContext)
 import Grisette.Lib.Synth.Operator.OpReachableSymbols
   ( OpReachableSymbols (opReachableSymbols),
@@ -58,7 +58,7 @@ data Op intVal
   | If (TypeSignature Type) T.Text T.Text
   deriving (Generic)
 
-deriveGADT [''Op] (allClasses01 \\ pprintClasses)
+derive [''Op] (allClasses01 \\ pprintClasses)
 
 type Prog varId intVal = Concrete.Prog (Op intVal) varId Type
 

control/Sketch.hs

@@ -23,7 +23,7 @@ import Grisette
     Mergeable,
     ToCon,
     allClasses01,
-    deriveGADT,
+    derive,
     mrgReturn,
   )
 import Grisette.Lib.Synth.Context (MonadAngelicContext, MonadContext)
@@ -58,7 +58,7 @@ data Op intVal
   | If (TypeSignature Type) T.Text T.Text
   deriving (Generic)
 
-deriveGADT [''Op] allClasses01
+derive [''Op] allClasses01
 
 deriving via
   (Default (Concrete.Op conIntVal))

control/Typing.hs

@@ -22,7 +22,7 @@ import Grisette
     Mergeable,
     PPrint (pformat),
     allClasses0,
-    deriveGADT,
+    derive,
   )
 import Grisette.Lib.Control.Monad (mrgReturn)
 import Grisette.Lib.Synth.Context (MonadContext)
@@ -33,7 +33,7 @@ import Value (Value, ValueBuilder (mkBool, mkInt))
 
 data Type = IntType | BoolType
 
-deriveGADT [''Type] (filter (/= ''PPrint) allClasses0)
+derive [''Type] (filter (/= ''PPrint) allClasses0)
 
 instance PPrint Type where
   pformat IntType = "int"

control/Value.hs

@@ -24,7 +24,7 @@ import Grisette
     MonadUnion,
     Union,
     allClasses0,
-    deriveGADT,
+    derive,
     liftToMonadUnion,
   )
 import Grisette.Lib.Control.Monad (mrgReturn)
@@ -35,7 +35,7 @@ data Value intVal boolVal
   = IntValue intVal
   | BoolValue boolVal
 
-deriveGADT [''Value] allClasses0
+derive [''Value] allClasses0
 
 class (Mergeable val) => ValueBuilder val where
   type IntValType val

src/Grisette/Lib/Synth/Combinator/Invoke.hs

@@ -23,7 +23,7 @@ import Grisette
     PPrint (pformat, pformatPrec),
     PPrint1 (liftPFormatPrec),
     allClasses01,
-    deriveGADT,
+    derive,
     mrgReturn,
     mrgSequence,
     nest,
@@ -68,7 +68,7 @@ data Invoke ty = Invoke
   }
   deriving (Generic)
 
-deriveGADT [''Invoke] (allClasses01 \\ pprintClasses)
+derive [''Invoke] (allClasses01 \\ pprintClasses)
 
 instance (PPrint ty) => PPrint (Invoke ty) where
   pformatPrec = pformatPrec1