Build with GHC 9.6.2

luc-tielen · Oct 14, 2023 · 0722d33 · 0722d33
1 parent 9d8ca30
commit 0722d33
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4 deletions.
diff --git a/cabal.project b/cabal.project
@@ -3,12 +3,12 @@ packages: .
 source-repository-package
     type: git
     location: https://github.com/luc-tielen/llvm-codegen.git
-    tag: 497c7c0ffad5f3e4b6f4e74550a477e75b0beb23
+    tag: 83b04cb576208ea74ddd62016e4fa03f0df138ac
 
 source-repository-package
     type: git
     location: https://github.com/luc-tielen/souffle-haskell.git
-    tag: bcd7e3c058c9036d8495cf114520663917b7ac81
+    tag: e441c84f1d64890e31c92fbb278c074ae8bcaff5
 
 source-repository-package
     type: git

diff --git a/lib/Eclair/EIR/Lower.hs b/lib/Eclair/EIR/Lower.hs
@@ -7,6 +7,7 @@ module Eclair.EIR.Lower
 import Prelude hiding (void)
 import qualified Prelude
 import qualified Relude (swap)
+import Control.Monad.Fix
 import Control.Monad.Morph hiding (embed)
 import qualified Data.ByteString as BS
 import qualified Data.Map as M

diff --git a/lib/Eclair/EIR/Lower/API.hs b/lib/Eclair/EIR/Lower/API.hs
@@ -8,6 +8,7 @@ module Eclair.EIR.Lower.API
   ) where
 
 import Prelude hiding (void)
+import Control.Monad.Fix
 import Control.Monad.Morph
 import Data.Traversable (for)
 import Data.Maybe (fromJust)

diff --git a/lib/Eclair/EIR/Lower/Externals.hs b/lib/Eclair/EIR/Lower/Externals.hs
@@ -5,6 +5,7 @@ module Eclair.EIR.Lower.Externals
   ) where
 
 import Prelude hiding (void)
+import Control.Monad.Fix
 import Eclair.EIR.Lower.Codegen
 import Eclair.LLVM.Codegen as LLVM
 import Eclair.Common.Config

diff --git a/lib/Eclair/LLVM/BTree.hs b/lib/Eclair/LLVM/BTree.hs
@@ -9,6 +9,7 @@ module Eclair.LLVM.BTree
   ) where
 
 import Prelude hiding (void, swap)
+import Control.Monad.Fix
 import Control.Monad.Morph
 import Eclair.LLVM.Codegen
 import Eclair.LLVM.Table

diff --git a/lib/Eclair/LLVM/Config.hs b/lib/Eclair/LLVM/Config.hs
@@ -7,6 +7,7 @@ module Eclair.LLVM.Config
 
 import qualified LLVM.C.API as LibLLVM
 import LLVM.Codegen
+import Control.Monad.Fix
 import Control.Monad.Morph
 import Foreign.ForeignPtr
 import Foreign.Ptr

diff --git a/lib/Eclair/LLVM/Template.hs b/lib/Eclair/LLVM/Template.hs
@@ -14,6 +14,7 @@ module Eclair.LLVM.Template
   ) where
 
 
+import Control.Monad.Fix
 import Control.Monad.Morph
 import LLVM.Codegen hiding (function, typedef)
 import qualified LLVM.Codegen as CG

diff --git a/lib/Eclair/Parser.hs b/lib/Eclair/Parser.hs
@@ -352,9 +352,9 @@ betweenParens =
 --   In case of error, keeps parsing up to and including 'endChar'
 withRecovery :: Char -> Parser a -> Parser (Maybe a)
 withRecovery endChar p =
-  P.withRecovery handleError $ map Just p
+  P.withRecovery handleErr $ map Just p
   where
-    handleError err = do
+    handleErr err = do
       P.registerParseError err
       _ <- P.takeWhileP Nothing (/= endChar)
       _ <- P.char endChar