Skip to content

Support semialign-1.4 #105

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

Merged
phadej merged 1 commit into from
May 12, 2026
Merged

Support semialign-1.4 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/Data/TreeDiff/OMap.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module Data.TreeDiff.OMap (
import Control.DeepSeq (NFData (..))
import Data.List (sortBy)
import Data.Ord (comparing)
import Data.Semialign (Semialign (..))
import Data.Semialign (Semialign(..), Unzip (..), unzipDefault)
import Data.These (These (..))

import qualified Data.Map.Strict as Map
Expand Down Expand Up @@ -148,3 +148,6 @@ instance Ord k => Semialign (OMap k) where
g (This (Val i x)) = Val i (f (This x))
g (That (Val j y)) = Val j (f (That y))
g (These (Val i x) (Val j y)) = Val (min i j) (f (These x y))

instance Unzip (OMap k) where
unzip = unzipDefault
27 changes: 10 additions & 17 deletions tree-diff.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
cabal-version: 2.2
name: tree-diff
version: 0.3.4.1
x-revision: 1
version: 0.3.5
synopsis: Diffing of (expression) trees.
category: Data, Testing
description:
Expand Down Expand Up @@ -106,17 +105,14 @@ library
, primitive ^>=0.9.0.0
, QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.16.0.0 || ^>=2.18.0.0
, scientific ^>=0.3.8.0
, semialign ^>=1.3.1
, semialign ^>=1.3.1 || ^>=1.4
, strict ^>=0.5
, tagged ^>=0.8.8
, these ^>=1.2.1
, unordered-containers ^>=0.2.20
, uuid-types ^>=1.0.6
, vector ^>=0.13.1.0

if !flag(base-ge-4-17)
build-depends: data-array-byte >=0.1.0.1 && <0.2

other-extensions:
CPP
ConstraintKinds
Expand All @@ -130,12 +126,6 @@ library
hs-source-dirs: src
default-language: Haskell2010

if flag(base-ge-4-17)
build-depends: base >=4.17

else
build-depends: base <4.17

test-suite tree-diff-test
default-language: Haskell2010
type: exitcode-stdio-1.0
Expand All @@ -154,11 +144,8 @@ test-suite tree-diff-test
, tree-diff
, unordered-containers

if (impl(ghc >=8) && !impl(ghc >=9.4))
build-depends: data-array-byte

if impl(ghc <7.5)
build-depends: ghc-prim
if !flag(base-ge-4-17)
build-depends: data-array-byte >=0.1.0.1 && <0.2

-- extra dependencies
build-depends:
Expand All @@ -167,6 +154,12 @@ test-suite tree-diff-test
, tasty-quickcheck ^>=0.10.3 || ^>=0.11
, trifecta ^>=2.1.4

if flag(base-ge-4-17)
build-depends: base >=4.17

else
build-depends: base <4.17

benchmark tree-diff-bench
default-language: Haskell2010
type: exitcode-stdio-1.0
Expand Down
Loading