From 2e13ec2cf4cbc87d50098ce7887c8c56cf5c244f Mon Sep 17 00:00:00 2001 From: crumbtoo Date: Tue, 13 Feb 2024 13:42:43 -0700 Subject: [PATCH] microlens -> lens i still love you microlens.. --- app/CoreDriver.hs | 2 +- app/Main.hs | 2 +- rlp.cabal | 18 ++++++------------ src/Compiler/RLPC.hs | 4 ++-- src/Compiler/RlpcError.hs | 3 +-- src/Control/Monad/Errorful.hs | 2 +- src/Core/HindleyMilner.hs | 4 +--- src/Core/Lex.x | 3 +-- src/Core/Parse.y | 2 +- src/Core/Syntax.hs | 2 -- src/Core/Utils.hs | 2 +- src/Core2Core.hs | 1 - src/GM.hs | 7 ++----- src/Rlp/Lex.x | 3 +-- src/Rlp/Parse.y | 2 +- src/Rlp/Parse/Associate.hs | 2 +- src/Rlp/Parse/Types.hs | 3 +-- src/Rlp/Syntax.hs | 3 +-- src/Rlp2Core.hs | 2 -- src/TI.hs | 3 +-- 20 files changed, 24 insertions(+), 46 deletions(-) diff --git a/app/CoreDriver.hs b/app/CoreDriver.hs index 2ded66e..f33954a 100644 --- a/app/CoreDriver.hs +++ b/app/CoreDriver.hs @@ -6,7 +6,7 @@ module CoreDriver import Compiler.RLPC import Control.Monad import Data.Text qualified as T -import Lens.Micro.Platform +import Control.Lens.Combinators import Core.Lex import Core.Parse diff --git a/app/Main.hs b/app/Main.hs index 5571352..adc9158 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -19,7 +19,7 @@ import System.Exit (exitSuccess) import Core import TI import GM -import Lens.Micro.Platform +import Control.Lens.Combinators hiding (argument) import CoreDriver qualified import RlpDriver qualified diff --git a/rlp.cabal b/rlp.cabal index 7ed9477..e1a30be 100644 --- a/rlp.cabal +++ b/rlp.cabal @@ -61,21 +61,15 @@ library , hashable >= 1.4.3 && < 1.5 , mtl >= 2.3.1 && < 2.4 , text >= 2.0.2 && < 2.1 - , megaparsec >= 9.6.1 && < 9.7 - , microlens >= 0.4.13 && < 0.5 - , microlens-mtl >= 0.2.0 && < 0.3 - , microlens-platform >= 0.4.3 && < 0.5 - , microlens-th >= 0.4.3 && < 0.5 , unordered-containers >= 0.2.20 && < 0.3 , recursion-schemes >= 5.2.2 && < 5.3 , data-fix >= 0.3.2 && < 0.4 , utf8-string >= 1.0.2 && < 1.1 - , extra >= 1.7.0 && < 2 - , semigroupoids - , comonad - , lens - , text-ansi - , microlens-pro ^>=0.2.0 + , extra >= 1.7.0 && <2 + , semigroupoids >=6.0 && <6.1 + , comonad >=5.0.0 && <6 + , lens >=5.2.3 && <6.0 + , text-ansi >=0.2.0 && <0.4 , effectful-core ^>=2.3.0.0 , deriving-compat ^>=0.6.0 , these >=0.2 && <2.0 @@ -102,9 +96,9 @@ executable rlpc build-depends: base >=4.17.0.0 && <4.20.0.0 , rlp , optparse-applicative >= 0.18.1 && < 0.19 - , microlens-platform , mtl >= 2.3.1 && < 2.4 , unordered-containers >= 0.2.20 && < 0.3 + , lens >=5.2.3 && <6.0 , text >= 2.0.2 && < 2.1 hs-source-dirs: app diff --git a/src/Compiler/RLPC.hs b/src/Compiler/RLPC.hs index ec4b8bf..fb599fc 100644 --- a/src/Compiler/RLPC.hs +++ b/src/Compiler/RLPC.hs @@ -64,8 +64,8 @@ import Data.Text.IO qualified as T import System.IO import Text.ANSI qualified as Ansi import Text.PrettyPrint hiding ((<>)) -import Lens.Micro.Platform -import Lens.Micro.Platform.Internal +import Control.Lens +import Data.Text.Lens (packed, unpacked, IsText) import System.Exit ---------------------------------------------------------------------------------- diff --git a/src/Compiler/RlpcError.hs b/src/Compiler/RlpcError.hs index a8ef710..6cb242e 100644 --- a/src/Compiler/RlpcError.hs +++ b/src/Compiler/RlpcError.hs @@ -21,8 +21,7 @@ import Control.Monad.Errorful import Data.Text (Text) import Data.Text qualified as T import GHC.Exts (IsString(..)) -import Lens.Micro.Platform -import Lens.Micro.Platform.Internal +import Control.Lens import Compiler.Types ---------------------------------------------------------------------------------- diff --git a/src/Control/Monad/Errorful.hs b/src/Control/Monad/Errorful.hs index 1d46e91..f5fd7cb 100644 --- a/src/Control/Monad/Errorful.hs +++ b/src/Control/Monad/Errorful.hs @@ -20,7 +20,7 @@ import Data.Functor.Identity import Data.Coerce import Data.HashSet (HashSet) import Data.HashSet qualified as H -import Lens.Micro +import Control.Lens ---------------------------------------------------------------------------------- newtype ErrorfulT e m a = ErrorfulT { runErrorfulT :: m (Maybe a, [e]) } diff --git a/src/Core/HindleyMilner.hs b/src/Core/HindleyMilner.hs index 17d7118..1aaeb2d 100644 --- a/src/Core/HindleyMilner.hs +++ b/src/Core/HindleyMilner.hs @@ -16,9 +16,7 @@ module Core.HindleyMilner ) where ---------------------------------------------------------------------------------- -import Lens.Micro -import Lens.Micro.Mtl -import Lens.Micro.Platform +import Control.Lens hiding (Context', Context) import Data.Maybe (fromMaybe) import Data.Text qualified as T import Data.Pretty (rpretty) diff --git a/src/Core/Lex.x b/src/Core/Lex.x index f62fb8d..d88a6cc 100644 --- a/src/Core/Lex.x +++ b/src/Core/Lex.x @@ -26,8 +26,7 @@ import Compiler.RLPC import Compiler.Types -- TODO: unify Located definitions import Compiler.RlpcError -import Lens.Micro -import Lens.Micro.TH +import Control.Lens } %wrapper "monad-strict-text" diff --git a/src/Core/Parse.y b/src/Core/Parse.y index fcb6e2c..91bfe68 100644 --- a/src/Core/Parse.y +++ b/src/Core/Parse.y @@ -24,7 +24,7 @@ import Core.Syntax import Core.Lex import Compiler.RLPC import Control.Monad -import Lens.Micro +import Control.Lens hiding (snoc) import Data.Default.Class (def) import Data.Hashable (Hashable) import Data.List.Extra diff --git a/src/Core/Syntax.hs b/src/Core/Syntax.hs index c7bc9ee..db4a4d7 100644 --- a/src/Core/Syntax.hs +++ b/src/Core/Syntax.hs @@ -60,8 +60,6 @@ import Data.Bifoldable (bifoldr) import GHC.Generics (Generic, Generically(..)) -- Lift instances for the Core quasiquoters import Language.Haskell.TH.Syntax (Lift) --- import Lens.Micro.TH (makeLenses) --- import Lens.Micro import Control.Lens ---------------------------------------------------------------------------------- diff --git a/src/Core/Utils.hs b/src/Core/Utils.hs index 956a067..7d62bba 100644 --- a/src/Core/Utils.hs +++ b/src/Core/Utils.hs @@ -13,7 +13,7 @@ import Data.Functor.Foldable import Data.Set (Set) import Data.Set qualified as S import Core.Syntax -import Lens.Micro +import Control.Lens import GHC.Exts (IsList(..)) ---------------------------------------------------------------------------------- diff --git a/src/Core2Core.hs b/src/Core2Core.hs index d1bcfe3..6fa535d 100644 --- a/src/Core2Core.hs +++ b/src/Core2Core.hs @@ -24,7 +24,6 @@ import Numeric (showHex) import Data.Pretty import Compiler.RLPC --- import Lens.Micro.Platform import Control.Lens import Core.Syntax import Core.Utils diff --git a/src/GM.hs b/src/GM.hs index c815e83..a414ff7 100644 --- a/src/GM.hs +++ b/src/GM.hs @@ -26,11 +26,8 @@ import Data.List (mapAccumL) import Data.Maybe (fromMaybe, mapMaybe) import Data.Monoid (Endo(..)) import Data.Tuple (swap) -import Lens.Micro -import Lens.Micro.Extras (view) -import Lens.Micro.TH -import Lens.Micro.Platform (packed, unpacked) -import Lens.Micro.Platform.Internal (IsText(..)) +import Control.Lens +import Data.Text.Lens (IsText, packed, unpacked) import Text.Printf import Text.PrettyPrint hiding ((<>)) import Text.PrettyPrint.HughesPJ (maybeParens) diff --git a/src/Rlp/Lex.x b/src/Rlp/Lex.x index d046499..ed12fcc 100644 --- a/src/Rlp/Lex.x +++ b/src/Rlp/Lex.x @@ -27,8 +27,7 @@ import Data.Text (Text) import Data.Text qualified as T import Data.Word import Data.Default -import Lens.Micro.Mtl -import Lens.Micro +import Control.Lens import Debug.Trace import Rlp.Parse.Types diff --git a/src/Rlp/Parse.y b/src/Rlp/Parse.y index 4b86aea..9f4a52f 100644 --- a/src/Rlp/Parse.y +++ b/src/Rlp/Parse.y @@ -13,7 +13,7 @@ import Rlp.Lex import Rlp.Syntax import Rlp.Parse.Types import Rlp.Parse.Associate -import Lens.Micro.Platform +import Control.Lens hiding (snoc, (.>), (<.), (<<~)) import Data.List.Extra import Data.Fix import Data.Functor.Const diff --git a/src/Rlp/Parse/Associate.hs b/src/Rlp/Parse/Associate.hs index 6757705..e261ca3 100644 --- a/src/Rlp/Parse/Associate.hs +++ b/src/Rlp/Parse/Associate.hs @@ -11,7 +11,7 @@ import Data.Functor.Const import Data.Functor import Data.Text qualified as T import Text.Printf -import Lens.Micro +import Control.Lens import Rlp.Parse.Types import Rlp.Syntax -------------------------------------------------------------------------------- diff --git a/src/Rlp/Parse/Types.hs b/src/Rlp/Parse/Types.hs index 1f71d2b..46020f0 100644 --- a/src/Rlp/Parse/Types.hs +++ b/src/Rlp/Parse/Types.hs @@ -44,8 +44,7 @@ import Data.HashMap.Strict qualified as H import Data.Void import Data.Word (Word8) import Data.Text qualified as T -import Lens.Micro.TH -import Lens.Micro +import Control.Lens hiding ((<<~)) import Rlp.Syntax import Compiler.Types -------------------------------------------------------------------------------- diff --git a/src/Rlp/Syntax.hs b/src/Rlp/Syntax.hs index 8b49edc..e3aebc1 100644 --- a/src/Rlp/Syntax.hs +++ b/src/Rlp/Syntax.hs @@ -57,8 +57,7 @@ import Data.Functor.Identity import Data.Kind (Type) import GHC.Generics import Language.Haskell.TH.Syntax (Lift) -import Lens.Micro.Pro -import Lens.Micro.Pro.TH +import Control.Lens import Core.Syntax hiding (Lit, Type, Binding, Binding') import Core (HasRHS(..), HasLHS(..)) ---------------------------------------------------------------------------------- diff --git a/src/Rlp2Core.hs b/src/Rlp2Core.hs index b938b74..cf8a2a7 100644 --- a/src/Rlp2Core.hs +++ b/src/Rlp2Core.hs @@ -13,8 +13,6 @@ import Control.Monad.Utils import Control.Arrow import Control.Applicative import Control.Comonad --- import Lens.Micro --- import Lens.Micro.Internal import Control.Lens import Compiler.RLPC import Data.List (mapAccumL, partition) diff --git a/src/TI.hs b/src/TI.hs index e51bd0c..5a0beef 100644 --- a/src/TI.hs +++ b/src/TI.hs @@ -20,8 +20,7 @@ import System.IO (Handle, hPutStr) import Text.Printf (printf, hPrintf) import Data.Proxy (Proxy(..)) import Data.Monoid (Endo(..)) -import Lens.Micro -import Lens.Micro.TH +import Control.Lens import Data.Pretty import Data.Heap import Core.Examples