Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with GHC 9.6.3 #163

Merged
merged 5 commits into from
Nov 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/EIR/Lower.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module Eclair.EIR.Lower
import Prelude hiding (void)
import qualified Prelude
import qualified Relude (swap)
import Control.Monad.Fix
kpadmasola marked this conversation as resolved.
Show resolved Hide resolved
import Control.Monad.Morph hiding (embed)
import qualified Data.ByteString as BS
import qualified Data.Map as M
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/EIR/Lower/API.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/EIR/Lower/Externals.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/LLVM/BTree.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/LLVM/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/Eclair/LLVM/Template.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/Eclair/Parser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
luc-tielen marked this conversation as resolved.
Show resolved Hide resolved
P.registerParseError err
_ <- P.takeWhileP Nothing (/= endChar)
_ <- P.char endChar
Expand Down
Loading