Add Solo instances

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.12
+# version: 0.13.20211030
 #
-# REGENDATA ("0.12",["github","--config=cabal.haskell-ci","lattices.cabal"])
+# REGENDATA ("0.13.20211030",["github","--config=cabal.haskell-ci","lattices.cabal"])
 #
 name: Haskell-CI
 on:
@@ -30,59 +30,118 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.2.1
+            compilerKind: ghc
+            compilerVersion: 9.2.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.0.1
+            compilerKind: ghc
+            compilerVersion: 9.0.1
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.10.4
+            compilerKind: ghc
+            compilerVersion: 8.10.4
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.8.3
+            compilerKind: ghc
+            compilerVersion: 8.8.3
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.6.5
+            compilerKind: ghc
+            compilerVersion: 8.6.5
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.4.4
+            compilerKind: ghc
+            compilerVersion: 8.4.4
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.2.2
+            compilerKind: ghc
+            compilerVersion: 8.2.2
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-8.0.2
+            compilerKind: ghc
+            compilerVersion: 8.0.2
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-7.10.3
+            compilerKind: ghc
+            compilerVersion: 7.10.3
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-7.8.4
+            compilerKind: ghc
+            compilerVersion: 7.8.4
+            setup-method: hvr-ppa
             allow-failure: false
           - compiler: ghc-7.6.3
+            compilerKind: ghc
+            compilerVersion: 7.6.3
+            setup-method: hvr-ppa
             allow-failure: false
       fail-fast: false
     steps:
       - name: apt
         run: |
           apt-get update
-          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
-          apt-add-repository -y 'ppa:hvr/ghc'
-          apt-get update
-          apt-get install -y $CC cabal-install-3.4
+          apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
+          if [ "${{ matrix.setup-method }}" = ghcup ]; then
+            mkdir -p "$HOME/.ghcup/bin"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            chmod a+x "$HOME/.ghcup/bin/ghcup"
+            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+          else
+            apt-add-repository -y 'ppa:hvr/ghc'
+            apt-get update
+            apt-get install -y "$HCNAME"
+            mkdir -p "$HOME/.ghcup/bin"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            chmod a+x "$HOME/.ghcup/bin/ghcup"
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+          fi
         env:
-          CC: ${{ matrix.compiler }}
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: Set PATH and environment variables
         run: |
           echo "$HOME/.cabal/bin" >> $GITHUB_PATH
-          echo "LANG=C.UTF-8" >> $GITHUB_ENV
-          echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
-          echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
-          HCDIR=$(echo "/opt/$CC" | sed 's/-/\//')
-          HCNAME=ghc
-          HC=$HCDIR/bin/$HCNAME
-          echo "HC=$HC" >> $GITHUB_ENV
-          echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
-          echo "HADDOCK=$HCDIR/bin/haddock" >> $GITHUB_ENV
-          echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
+          echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
+          echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
+          echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
+          HCDIR=/opt/$HCKIND/$HCVER
+          if [ "${{ matrix.setup-method }}" = ghcup ]; then
+            HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
+            echo "HC=$HC" >> "$GITHUB_ENV"
+            echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
+            echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
+            echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          else
+            HC=$HCDIR/bin/$HCKIND
+            echo "HC=$HC" >> "$GITHUB_ENV"
+            echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
+            echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
+            echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          fi
+
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
-          echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
-          echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
-          echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
-          echo "HEADHACKAGE=false" >> $GITHUB_ENV
-          echo "ARG_COMPILER=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
-          echo "GHCJSARITH=0" >> $GITHUB_ENV
+          echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
+          echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
+          echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
+          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
+          echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
+          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
-          CC: ${{ matrix.compiler }}
+          HCKIND: ${{ matrix.compilerKind }}
+          HCNAME: ${{ matrix.compiler }}
+          HCVER: ${{ matrix.compilerVersion }}
       - name: env
         run: |
           env
@@ -117,7 +176,7 @@ jobs:
       - name: cache (tools)
         uses: actions/cache@v2
         with:
-          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-7e5c568c
+          key: ${{ runner.os }}-${{ matrix.compiler }}-tools-a12dda74
           path: ~/.haskell-ci-tools
       - name: install cabal-plan
         run: |
@@ -161,7 +220,8 @@ jobs:
       - name: generate cabal.project
         run: |
           PKGDIR_lattices="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/lattices-[0-9.]*')"
-          echo "PKGDIR_lattices=${PKGDIR_lattices}" >> $GITHUB_ENV
+          echo "PKGDIR_lattices=${PKGDIR_lattices}" >> "$GITHUB_ENV"
+          rm -f cabal.project cabal.project.local
           touch cabal.project
           touch cabal.project.local
           echo "packages: ${PKGDIR_lattices}" >> cabal.project

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.3 (2021-10-30)
+
+- Add instances for `Solo`
+
 # 2.0.2 (2020-02-18)
 
 - Add `Algebra.Lattice.Stacked`

lattices.cabal

@@ -1,7 +1,6 @@
 cabal-version:      1.18
 name:               lattices
-version:            2.0.2
-x-revision:         4
+version:            2.0.3
 category:           Math
 license:            BSD3
 license-file:       LICENSE
@@ -33,6 +32,7 @@ tested-with:
    || ==8.8.3
    || ==8.10.4
    || ==9.0.1
+   || ==9.2.1
 
 synopsis:
   Fine-grained library for constructing and manipulating lattices
@@ -82,7 +82,7 @@ library
     Algebra.PartialOrd.Instances
 
   build-depends:
-      base                        >=4.6      && <4.16
+      base                        >=4.6      && <4.17
     , base-compat                 >=0.10.5   && <0.13
     , containers                  >=0.5.0.0  && <0.7
     , deepseq                     >=1.3.0.0  && <1.5
@@ -96,6 +96,12 @@ library
     , universe-reverse-instances  >=1.1      && <1.2
     , unordered-containers        >=0.2.8.0  && <0.3
 
+  if !impl(ghc >=9.2)
+    if impl(ghc >=9.0)
+      build-depends: ghc-prim
+    else
+      build-depends: OneTuple >=0.3 && <0.4
+
   if !impl(ghc >=8.0)
     build-depends: semigroups >=0.18.5 && <0.20
 

src/Algebra/Heyting.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE Safe            #-}
 ----------------------------------------------------------------------------
@@ -26,6 +27,14 @@ import Data.Universe.Class   (Finite (..))
 import qualified Data.HashSet as HS
 import qualified Data.Set     as Set
 
+#if MIN_VERSION_base(4,16,0)
+import Data.Tuple (Solo (..))
+#elif MIN_VERSION_base(4,15,0)
+import GHC.Tuple (Solo (..))
+#else
+import Data.Tuple.Solo (Solo (..))
+#endif
+
 -- | A Heyting algebra is a bounded lattice equipped with a
 -- binary operation \(a \to b\) of implication.
 --
@@ -101,7 +110,7 @@ instance Heyting a => Heyting (Endo a) where
     Endo a <=> Endo b = Endo (a <=> b)
 
 -------------------------------------------------------------------------------
--- Proxy, Tagged, Const, Identity
+-- Proxy, Tagged, Const, Identity, Solo
 -------------------------------------------------------------------------------
 
 instance Heyting (Proxy a) where
@@ -124,6 +133,12 @@ instance Heyting a => Heyting (Const a b) where
     neg (Const a)       = Const (neg a)
     Const a <=> Const b = Const (a <=> b)
 
+-- | @since 2.0.3
+instance Heyting a => Heyting (Solo a) where
+    Solo a ==> Solo b = Solo (a ==> b)
+    neg (Solo a)      = Solo (neg a)
+    Solo a <=> Solo b = Solo (a <=> b)
+
 -------------------------------------------------------------------------------
 -- Sets
 -------------------------------------------------------------------------------

src/Algebra/Lattice.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                #-}
 {-# LANGUAGE ConstraintKinds    #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric      #-}
@@ -65,6 +66,14 @@ import qualified Data.Map          as Map
 import qualified Data.Set          as Set
 import qualified Test.QuickCheck   as QC
 
+#if MIN_VERSION_base(4,16,0)
+import Data.Tuple (Solo (..))
+#elif MIN_VERSION_base(4,15,0)
+import GHC.Tuple (Solo (..))
+#else
+import Data.Tuple.Solo (Solo (..))
+#endif
+
 infixr 6 /\ -- This comment needed because of CPP
 infixr 5 \/
 
@@ -488,6 +497,23 @@ instance Lattice QC.Property where
 instance BoundedJoinSemiLattice QC.Property where bottom = QC.property False
 instance BoundedMeetSemiLattice QC.Property where top = QC.property True
 
+-------------------------------------------------------------------------------
+-- OneTuple
+-------------------------------------------------------------------------------
+
+-- | @since 2.0.3
+instance Lattice a => Lattice (Solo a) where
+  Solo a \/ Solo b = Solo (a \/ b)
+  Solo a /\ Solo b = Solo (a /\ b)
+
+-- | @since 2.0.3
+instance BoundedMeetSemiLattice a => BoundedMeetSemiLattice (Solo a) where
+  top = Solo top
+
+-- | @since 2.0.3
+instance BoundedJoinSemiLattice a => BoundedJoinSemiLattice (Solo a) where
+  bottom = Solo bottom
+
 -------------------------------------------------------------------------------
 -- Theorems
 -------------------------------------------------------------------------------