From 728ca999fbaf411df73acc7dfc3d43a7cb5d41bb Mon Sep 17 00:00:00 2001 From: Yogesh Sajanikar Date: Tue, 2 Aug 2022 15:19:55 +0530 Subject: [PATCH] Stylish-Haskell formatting fix --- io-sim/src/Control/Monad/IOSim/Internal.hs | 8 ++++---- io-sim/src/Control/Monad/IOSim/Types.hs | 2 +- io-sim/src/Control/Monad/IOSimPOR/Internal.hs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/io-sim/src/Control/Monad/IOSim/Internal.hs b/io-sim/src/Control/Monad/IOSim/Internal.hs index 25c8c1a4..76af5e9d 100644 --- a/io-sim/src/Control/Monad/IOSim/Internal.hs +++ b/io-sim/src/Control/Monad/IOSim/Internal.hs @@ -897,7 +897,7 @@ execAtomically !time !tid !tlbl !nextVid0 action0 k0 = ThrowStm e -> {-# SCC "execAtomically.go.ThrowStm" #-} - case ctl of + case ctl of AtomicallyFrame -> do -- Revert all the TVar writes !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written @@ -910,19 +910,19 @@ execAtomically !time !tid !tlbl !nextVid0 action0 k0 = -- Execute the catch handler with an empty written set let ctl'' = BranchFrame EmptyStmA k writtenOuter writtenOuterSeq createdOuterSeq ctl' go ctl'' read Map.empty [] [] nextVid (h e) - -- + -- BranchFrame _ _k writtenOuter writtenOuterSeq createdOuterSeq ctl' -> {-# SCC "execAtomically.go.branchFrame" #-} do -- Revert all the TVar writes within this orElse !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written go ctl' read writtenOuter writtenOuterSeq createdOuterSeq nextVid (ThrowStm e) - CatchStm a h k -> + CatchStm a h k -> {-# SCC "execAtomically.go.ThrowStm" #-} do -- Execute the left side in a new frame with an empty written set let ctl' = BranchFrame (CatchStmA h) k written writtenSeq createdSeq ctl go ctl' read Map.empty [] [] nextVid a - + Retry -> {-# SCC "execAtomically.go.Retry" #-} diff --git a/io-sim/src/Control/Monad/IOSim/Types.hs b/io-sim/src/Control/Monad/IOSim/Types.hs index 353b95df..c97ad8e3 100644 --- a/io-sim/src/Control/Monad/IOSim/Types.hs +++ b/io-sim/src/Control/Monad/IOSim/Types.hs @@ -318,7 +318,7 @@ instance Exceptions.MonadThrow (STM s) where instance MonadCatch (STM s) where catch action handler = STM $ oneShot $ \k -> CatchStm (runSTM action) (runSTM . handler') k - where + where handler' e = case fromException e of Nothing -> throwIO e -- Rethrow the exception if handler does not handle it. Just e' -> handler e' diff --git a/io-sim/src/Control/Monad/IOSimPOR/Internal.hs b/io-sim/src/Control/Monad/IOSimPOR/Internal.hs index a7b25e6d..8386014d 100644 --- a/io-sim/src/Control/Monad/IOSimPOR/Internal.hs +++ b/io-sim/src/Control/Monad/IOSimPOR/Internal.hs @@ -1108,7 +1108,7 @@ execAtomically time tid tlbl nextVid0 action0 k0 = ThrowStm e -> {-# SCC "execAtomically.go.ThrowStm" #-} - case ctl of + case ctl of AtomicallyFrame -> do -- Revert all the TVar writes !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written @@ -1121,14 +1121,14 @@ execAtomically time tid tlbl nextVid0 action0 k0 = -- Execute the catch handler with an empty written set let ctl'' = BranchFrame EmptyStmA k writtenOuter writtenOuterSeq createdOuterSeq ctl' go ctl'' read Map.empty [] [] nextVid (h e) - -- + -- BranchFrame _ _k writtenOuter writtenOuterSeq createdOuterSeq ctl' -> {-# SCC "execAtomically.go.branchFrame" #-} do -- Revert all the TVar writes within this orElse !_ <- traverse_ (\(SomeTVar tvar) -> revertTVar tvar) written go ctl' read writtenOuter writtenOuterSeq createdOuterSeq nextVid (ThrowStm e) - CatchStm a h k -> + CatchStm a h k -> {-# SCC "execAtomically.go.ThrowStm" #-} do -- Execute the left side in a new frame with an empty written set let ctl' = BranchFrame (CatchStmA h) k written writtenSeq createdSeq ctl