diff --git a/dex.cabal b/dex.cabal index 6a5090c5c..a3b8dc8bf 100644 --- a/dex.cabal +++ b/dex.cabal @@ -91,7 +91,6 @@ library , megaparsec , parser-combinators -- Text output - -- , prettyprinter , text -- Portable system utilities , directory @@ -103,8 +102,6 @@ library , aeson , store , time - -- Floating-point pedanticness (correcting for GHC < 9.2.2) - , floating-bits , binary , blaze-html , blaze-markup @@ -209,7 +206,6 @@ executable dex , haskeline , mtl , optparse-applicative - -- , prettyprinter , store , text , unix diff --git a/src/lib/ConcreteSyntax.hs b/src/lib/ConcreteSyntax.hs index 983e6897e..8946b5812 100644 --- a/src/lib/ConcreteSyntax.hs +++ b/src/lib/ConcreteSyntax.hs @@ -11,6 +11,7 @@ module ConcreteSyntax ( finishUModuleParse, preludeImportBlock, mustParseSourceBlock, pattern Identifier) where +import Control.Monad import Control.Monad.Combinators.Expr qualified as Expr import Control.Monad.Reader import Data.Char diff --git a/src/lib/Lexing.hs b/src/lib/Lexing.hs index 9d936851d..118d63f06 100644 --- a/src/lib/Lexing.hs +++ b/src/lib/Lexing.hs @@ -6,6 +6,7 @@ module Lexing where +import Control.Monad import Control.Monad.State.Strict import Data.Char import Data.HashSet qualified as HS diff --git a/src/lib/Name.hs b/src/lib/Name.hs index 86bb1e08f..21c3f0367 100644 --- a/src/lib/Name.hs +++ b/src/lib/Name.hs @@ -16,6 +16,7 @@ module Name import Prelude hiding (id, (.)) import Control.Category import Control.Applicative +import Control.Monad import Control.Monad.Identity import Control.Monad.Except hiding (Except) import Control.Monad.Reader @@ -1256,8 +1257,8 @@ instance (ScopeReader m, ScopeExtender m) instance (Monad1 m, ScopeReader m, ScopeExtender m, Fallible1 m) => ZipSubstReader (ZipSubstReaderT m) where - lookupZipSubstFst v = ZipSubstReaderT $ (!v) <$> fst <$> ask - lookupZipSubstSnd v = ZipSubstReaderT $ (!v) <$> snd <$> ask + lookupZipSubstFst v = ZipSubstReaderT $ (! v) <$> fst <$> ask + lookupZipSubstSnd v = ZipSubstReaderT $ (! v) <$> snd <$> ask extendZipSubstFst frag (ZipSubstReaderT cont) = ZipSubstReaderT $ withReaderT (onFst (<>>frag)) cont extendZipSubstSnd frag (ZipSubstReaderT cont) = ZipSubstReaderT $ withReaderT (onSnd (<>>frag)) cont diff --git a/src/lib/SourceRename.hs b/src/lib/SourceRename.hs index 4e2d0979d..05694dc1c 100644 --- a/src/lib/SourceRename.hs +++ b/src/lib/SourceRename.hs @@ -10,6 +10,7 @@ module SourceRename ( renameSourceNames ) where import Prelude hiding (id, (.)) import Control.Category +import Control.Monad import Control.Monad.Reader import Control.Monad.State.Strict import qualified Data.Set as S diff --git a/src/lib/Subst.hs b/src/lib/Subst.hs index 6b9a3cd99..6695cd9c0 100644 --- a/src/lib/Subst.hs +++ b/src/lib/Subst.hs @@ -29,7 +29,7 @@ class (SinkableE v, Monad2 m) => SubstReader (v::E) (m::MonadKind2) | m -> v whe withSubst :: Subst v i' o -> m i' o a -> m i o a lookupSubstM :: SubstReader v m => Name i -> m i o (v o) -lookupSubstM name = (!name) <$> getSubst +lookupSubstM name = (! name) <$> getSubst dropSubst :: (SubstReader v m, FromName v) => m o o a -> m i o a dropSubst cont = withSubst idSubst cont diff --git a/src/lib/Util.hs b/src/lib/Util.hs index 2bb1504e7..03b545329 100644 --- a/src/lib/Util.hs +++ b/src/lib/Util.hs @@ -12,6 +12,7 @@ import Prelude import qualified Data.Set as Set import qualified Data.Map.Strict as M import Control.Applicative +import Control.Monad import Control.Monad.Reader import Control.Monad.State.Strict import System.CPUTime diff --git a/stack.yaml b/stack.yaml index bf9cce344..d69ff4c41 100644 --- a/stack.yaml +++ b/stack.yaml @@ -4,36 +4,13 @@ # license that can be found in the LICENSE file or at # https://developers.google.com/open-source/licenses/bsd -resolver: lts-18.23 - -packages: -- . - -extra-deps: - - github: llvm-hs/llvm-hs - commit: 423220bffac4990d019fc088c46c5f25310d5a33 - subdirs: - - llvm-hs - - llvm-hs-pure - - megaparsec-8.0.0 - - prettyprinter-1.6.2 - - store-0.7.8@sha256:0b604101fd5053b6d7d56a4ef4c2addf97f4e08fe8cd06b87ef86f958afef3ae,8001 - - store-core-0.4.4.4@sha256:a19098ca8419ea4f6f387790e942a7a5d0acf62fe1beff7662f098cfb611334c,1430 - - th-utilities-0.2.4.1@sha256:b37d23c8bdabd678aee5a36dd4373049d4179e9a85f34eb437e9cd3f04f435ca,1869 - - floating-bits-0.3.0.0@sha256:742bcfcbc21b8daffc995990ee2399ab49550e8f4dd0dff1732d18f57a064c83,2442 - -nix: - enable: false - packages: [ libpng llvm_12 pkg-config zlib ] +resolver: lts-22.42 ghc-options: containers: -fno-prof-auto -O2 hashable: -fno-prof-auto -O2 - llvm-hs-pure: -fno-prof-auto -O2 - llvm-hs: -fno-prof-auto -O2 megaparsec: -fno-prof-auto -O2 parser-combinators: -fno-prof-auto -O2 - prettyprinter: -fno-prof-auto -O2 store-core: -fno-prof-auto -O2 store: -fno-prof-auto -O2 unordered-containers: -fno-prof-auto -O2