fixup! fixup! io-sim: Add support for unique symbol generation

Author: LSLeary

io-sim/src/Control/Monad/IOSim.hs

@@ -48,7 +48,7 @@ module Control.Monad.IOSim
   , ThreadLabel
   , IOSimThreadId (..)
   , Labelled (..)
-  , IOSimUnique
+  , Unique
     -- ** Dynamic Tracing
   , traceM
   , traceSTM

io-sim/src/Control/Monad/IOSim/CommonTypes.hs

@@ -29,7 +29,7 @@ module Control.Monad.IOSim.CommonTypes
   , BlockedReason (..)
   , Labelled (..)
   , ppLabelled
-  , IOSimUnique(..)
+  , Unique (..)
     -- * Utils
   , ppList
   ) where
@@ -205,10 +205,10 @@ ppLabelled pp Labelled { l_labelled = a, l_label = Nothing  } = pp a
 ppLabelled pp Labelled { l_labelled = a, l_label = Just lbl } = concat ["Labelled ", pp a, " ", lbl]
 
 -- | Abstract unique symbols à la "Data.Unique".
-newtype IOSimUnique s = MkUnique{ unMkUnique :: Integer }
+newtype Unique s = MkUnique{ unMkUnique :: Integer }
   deriving stock   (Eq, Ord)
   deriving newtype (Hashable, NFData)
-type role IOSimUnique nominal
+type role Unique nominal
 
 --
 -- Utils

io-sim/src/Control/Monad/IOSim/Internal.hs

@@ -144,7 +144,7 @@ data SimState s a = SimState {
        clocks   :: !(Map ClockId UTCTime),
        nextVid  :: !VarId,          -- ^ next unused 'VarId'
        nextTmid :: !TimeoutId,      -- ^ next unused 'TimeoutId'
-       nextUniq :: !(IOSimUnique s) -- ^ next unused @'IOSimUnique' s@
+       nextUniq :: !(Unique s) -- ^ next unused @'Unique' s@
      }
 
 initialState :: SimState s a

io-sim/src/Control/Monad/IOSim/Types.hs

@@ -105,7 +105,6 @@ import Control.Monad.Fail qualified as Fail
 import Data.Bifoldable
 import Data.Bifunctor (bimap)
 import Data.Dynamic (Dynamic, toDyn)
-import Data.Hashable (Hashable(hash))
 import Data.List.Trace qualified as Trace
 import Data.Map.Strict (Map)
 import Data.Maybe (fromMaybe)
@@ -124,6 +123,7 @@ import GHC.Generics (Generic)
 import Quiet (Quiet (..))
 
 import Control.Monad.IOSim.CommonTypes
+import Control.Monad.IOSim.CommonTypes qualified as Sim
 import Control.Monad.IOSim.STM
 import Control.Monad.IOSimPOR.Types
 
@@ -195,7 +195,7 @@ data SimA s a where
   ExploreRaces :: SimA s b -> SimA s b
 
   Fix          :: (x -> IOSim s x) -> (x -> SimA s r) -> SimA s r
-  NewUnique    :: (IOSimUnique s -> SimA s r) -> SimA s r
+  NewUnique    :: (Sim.Unique s -> SimA s r) -> SimA s r
 
 
 newtype STM s a = STM { unSTM :: forall r. (a -> StmA s r) -> StmA s r }
@@ -630,9 +630,9 @@ instance MonadLabelledMVar (IOSim s) where
   labelMVar = labelMVarDefault
 
 instance MonadUnique (IOSim s) where
-  type Unique (IOSim s) = IOSimUnique s
+  type Unique (IOSim s) = Sim.Unique s
   newUnique  = IOSim (oneShot NewUnique)
-  hashUnique = hash
+  hashUnique = fromInteger . unMkUnique
 
 data Async s a = Async !IOSimThreadId (STM s (Either SomeException a))
 
@@ -1065,7 +1065,7 @@ data SimEventType
   -- ^ thread terminated by an unhandled exception
 
   | EventUniqueCreated Integer
-  -- ^ created the n-th 'IOSimUnique'
+  -- ^ created the n-th 'Unique'
 
   --
   -- STM events

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

@@ -200,7 +200,7 @@ data SimState s a = SimState {
        nextTmid         :: !TimeoutId,  -- ^ next unused 'TimeoutId'
        -- | previous steps (which we may race with).
        -- Note this is *lazy*, so that we don't compute races we will not reverse.
-       nextUniq         :: !(IOSimUnique s), -- ^ next unused @'IOSimUnique' s@
+       nextUniq         :: !(Unique s), -- ^ next unused @'Unique' s@
        races            :: Races,
        -- | control the schedule followed, and initial value
        control          :: !ScheduleControl,