Skip to content

GHC 9.10 compatibility #5

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.

Sign up for GitHub

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

Open
gergoerdi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

GHC 9.10 compatibility #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a77298
Avoid spurious warning if `Prelude` already re-exports `(<$>)`
gergoerdi Aug 31, 2023
eaef934
GHC 9.4 compatibility
gergoerdi Aug 31, 2023
0d90e8e
GHC 9.10 compatibility
gergoerdi May 30, 2026
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
6 changes: 6 additions & 0 deletions src/Z80/Assembler.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE CPP #-}

{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

module Z80.Assembler
Expand All @@ -22,11 +25,14 @@ import Data.Word
import qualified Data.ByteString as BS
import Data.ByteString (ByteString)

import Control.Monad.Fix (MonadFix(..))
import Control.Monad.RWS
import Data.Maybe

#if !MIN_VERSION_base(4,8,0)
import Control.Applicative
import Data.Traversable (traverse)
#endif
import Prelude

import Z80.Operands
Expand Down
4 changes: 4 additions & 0 deletions src/Z80/Operations.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE IncoherentInstances #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE CPP #-}
{-# OPTIONS_GHC -fno-warn-name-shadowing #-}

module Z80.Operations
Expand Down Expand Up @@ -107,7 +109,9 @@ import Data.Word
import Z80.Assembler
import Z80.Operands

#if !MIN_VERSION_base(4,8,0)
import Control.Applicative ((<$>))
#endif
import Control.Monad ((>=>))
import Prelude hiding (and, or)

Expand Down
6 changes: 3 additions & 3 deletions z80.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ library
Z80.Operands,
Z80.Operands.LowerCase,
Z80.Macros
build-depends: base >=4.7 && <4.9,
build-depends: base >=4.7,
bytestring,
mtl
hs-source-dirs: src
Expand All @@ -29,12 +29,12 @@ library
test-suite tests
type: exitcode-stdio-1.0
main-is: tests.hs
build-depends: base >=4.7 && <4.9,
build-depends: base >=4.7,
bytestring,
mtl,
HUnit,
tasty,
tasty-hunit
hs-source-dirs: tests, src
ghc-options: -Wall
default-language: Haskell2010
default-language: Haskell2010