Add Show requirement on Action results

Author: UlfNorell

quickcheck-dynamic/src/Test/QuickCheck/DynamicLogic.hs

@@ -60,10 +60,10 @@ instance Monad (DL s) where
 instance MonadFail (DL s) where
   fail = errorDL
 
-action :: (Typeable a, Eq (Action s a), Show (Action s a)) => Action s a -> DL s (Var a)
+action :: (Typeable a, Show a, Eq (Action s a), Show (Action s a)) => Action s a -> DL s (Var a)
 action cmd = DL $ \_ k -> DL.after cmd k
 
-failingAction :: (Typeable a, Eq (Action s a), Show (Action s a)) => Action s a -> DL s ()
+failingAction :: (Typeable a, Show a, Eq (Action s a), Show (Action s a)) => Action s a -> DL s ()
 failingAction cmd = DL $ \_ k -> DL.afterNegative cmd (k ())
 
 anyAction :: DL s ()
@@ -96,7 +96,7 @@ getModelStateDL = DL $ \s k -> k (underlyingState s) s
 getVarContextDL :: DL s VarContext
 getVarContextDL = DL $ \s k -> k (vars s) s
 
-forAllVar :: forall a s. Typeable a => DL s (Var a)
+forAllVar :: forall a s. (Typeable a, Show a) => DL s (Var a)
 forAllVar = do
   xs <- ctxAtType <$> getVarContextDL
   forAllQ $ elementsQ xs

quickcheck-dynamic/src/Test/QuickCheck/DynamicLogic/Internal.hs

@@ -33,7 +33,7 @@ data DynLogic s
     Stopping (DynLogic s)
   | -- | After a specific action the predicate should hold
     forall a.
-    (Eq (Action s a), Show (Action s a), Typeable a) =>
+    (Eq (Action s a), Show (Action s a), Typeable a, Show a) =>
     After (ActionWithPolarity s a) (Var a -> DynPred s)
   | Error String (DynPred s)
   | -- | Adjust the probability of picking a branch
@@ -66,7 +66,7 @@ afterAny :: (Annotated s -> DynFormula s) -> DynFormula s
 afterAny f = DynFormula $ \n -> AfterAny $ \s -> unDynFormula (f s) n
 
 afterPolar
-  :: (Typeable a, Eq (Action s a), Show (Action s a))
+  :: (Typeable a, Show a, Eq (Action s a), Show (Action s a))
   => ActionWithPolarity s a
   -> (Var a -> Annotated s -> DynFormula s)
   -> DynFormula s
@@ -75,7 +75,7 @@ afterPolar act f = DynFormula $ \n -> After act $ \x s -> unDynFormula (f x s) n
 -- | Given `f` must be `True` after /some/ action.
 -- `f` is passed the state resulting from executing the `Action`.
 after
-  :: (Typeable a, Eq (Action s a), Show (Action s a))
+  :: (Typeable a, Show a, Eq (Action s a), Show (Action s a))
   => Action s a
   -> (Var a -> Annotated s -> DynFormula s)
   -> DynFormula s
@@ -85,7 +85,7 @@ after act f = afterPolar (ActionWithPolarity act PosPolarity) f
 -- `f` is passed the state resulting from executing the `Action`
 -- as a negative action.
 afterNegative
-  :: (Typeable a, Eq (Action s a), Show (Action s a))
+  :: (Typeable a, Show a, Eq (Action s a), Show (Action s a))
   => Action s a
   -> (Annotated s -> DynFormula s)
   -> DynFormula s

quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs

@@ -320,7 +320,7 @@ deriving instance Eq (Action state a) => Eq (ActionWithPolarity state a)
 
 data Step state where
   (:=)
-    :: (Typeable a, Eq (Action state a), Show (Action state a))
+    :: (Typeable a, Show a, Eq (Action state a), Show (Action state a))
     => Var a
     -> ActionWithPolarity state a
     -> Step state
@@ -515,7 +515,7 @@ computePrecondition s (ActionWithPolarity a p) =
         && polarPrecondition
 
 computeNextState
-  :: (StateModel state, Typeable a)
+  :: (StateModel state, Typeable a, Show a)
   => Annotated state
   -> ActionWithPolarity state a
   -> Var a
@@ -750,7 +750,7 @@ genParActions = do
               _   -> error "I'm the pope"
 
 data TraceStep state m where
-  TraceStep :: (Typeable a)
+  TraceStep :: (Typeable a, Show a)
             => Either (Error state m) a
             -> Var a
             -> ActionWithPolarity state a

quickcheck-dynamic/src/Test/QuickCheck/StateModel/Variables.hs

@@ -59,7 +59,7 @@ class HasVariables a where
 instance HasVariables a => HasVariables (Smart a) where
   getAllVariables (Smart _ a) = getAllVariables a
 
-instance Typeable a => HasVariables (Var a) where
+instance (Typeable a, Show a) => HasVariables (Var a) where
   getAllVariables = Set.singleton . Some
 
 instance (HasVariables k, HasVariables v) => HasVariables (Map k v) where
@@ -88,7 +88,7 @@ deriving via HasNoVariables Word32 instance HasVariables Word32
 deriving via HasNoVariables Word64 instance HasVariables Word64
 
 data Any f where
-  Some :: (Typeable a, Eq (f a)) => f a -> Any f
+  Some :: (Typeable a, Show a, Eq (f a)) => f a -> Any f
 
 instance Eq (Any f) where
   Some (a :: f a) == Some (b :: f b) =
@@ -117,7 +117,7 @@ instance Show VarContext where
 isEmptyCtx :: VarContext -> Bool
 isEmptyCtx (VarCtx ctx) = null ctx
 
-isWellTyped :: Typeable a => Var a -> VarContext -> Bool
+isWellTyped :: (Typeable a, Show a) => Var a -> VarContext -> Bool
 isWellTyped v (VarCtx ctx) = not (null ctx) && Some v `Set.member` ctx
 
 wellTypedIn :: HasVariables a => a -> VarContext -> Bool
@@ -129,7 +129,7 @@ wellTypedIn a ctx = all (\(Some v) -> v `isWellTyped` ctx) (getAllVariables a)
 -- cause an issue, but it might be good practise to crash
 -- if the invariant is violated anyway as it is evidence that
 -- something is horribly broken at the use site).
-extendContext :: Typeable a => VarContext -> Var a -> VarContext
+extendContext :: (Typeable a, Show a) => VarContext -> Var a -> VarContext
 extendContext (VarCtx ctx) v = VarCtx $ Set.insert (Some v) ctx
 
 emptyContext :: VarContext