Skip to content

Commit b826f42

Browse files
copilot-theorem: Add explicit imports for Control.Monad. Refs #491.
The modules in Control.Monad.* in mtl >= 2.3 no longer re-export Control.Monad, leading to a number of compilation errors in copilot-theorem. Since mtl >= 2.3 is required for Copilot to work with GHC 9.6 and above, this issue prevents Copilot from compiling with current versions of GHC, including the one in hackage. This commit updates copilot-theorem so that any imports from Control.Monad are explicit and not via re-exports from other modules.
1 parent 1c6e0c7 commit b826f42

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

copilot-theorem/src/Copilot/Theorem/IL/Translate.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import qualified Copilot.Core as C
1414

1515
import qualified Data.Map.Strict as Map
1616

17+
import Control.Monad (forM, liftM2, when)
1718
import Control.Monad.State
1819

1920
import Data.Char

copilot-theorem/src/Copilot/Theorem/Prove.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import qualified Copilot.Core as Core
2222

2323
import Data.List (intercalate)
2424
import Control.Applicative (liftA2)
25+
import Control.Monad (ap, liftM)
2526
import Control.Monad.Writer
2627

2728
-- | Output produced by a prover, containing the 'Status' of the proof and

copilot-theorem/src/Copilot/Theorem/TransSys/Translate.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import Copilot.Theorem.TransSys.Spec
4747
import Copilot.Theorem.TransSys.Cast
4848
import Copilot.Theorem.Misc.Utils
4949

50+
import Control.Monad (liftM, liftM2, unless)
5051
import Control.Monad.State.Lazy
5152

5253
import Data.Char (isNumber)

copilot-theorem/src/Copilot/Theorem/What4.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import qualified What4.InterpretedFloatingPoint as WFP
5757
import qualified What4.Solver as WS
5858
import qualified What4.Solver.DReal as WS
5959

60+
import Control.Monad (forM)
6061
import Control.Monad.State
6162
import qualified Data.BitVector.Sized as BV
6263
import Data.Foldable (foldrM)

0 commit comments

Comments
 (0)