msyds/rlp
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

microlens -> lens

Browse Source 
i still love you microlens..
This commit is contained in:
crumbtoo
2024-02-13 13:42:43 -07:00
parent ccc71a751c
commit 2e13ec2cf4
20 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/CoreDriver.hs
View File

@@ -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

2
app/Main.hs
View File

@@ -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

18
rlp.cabal
View File

@@ -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

4
src/Compiler/RLPC.hs
View File

@@ -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
----------------------------------------------------------------------------------

3
src/Compiler/RlpcError.hs
View File

@@ -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
----------------------------------------------------------------------------------

2
src/Control/Monad/Errorful.hs
View File

@@ -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]) }

4
src/Core/HindleyMilner.hs
View File

@@ -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)

3
src/Core/Lex.x
View File

@@ -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"

2
src/Core/Parse.y
View File

@@ -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

2
src/Core/Syntax.hs
View File

@@ -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
----------------------------------------------------------------------------------

2
src/Core/Utils.hs
View File

@@ -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(..))
----------------------------------------------------------------------------------

1
src/Core2Core.hs
View File

@@ -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

7
src/GM.hs
View File

@@ -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)

3
src/Rlp/Lex.x
View File

@@ -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

2
src/Rlp/Parse.y
View File

@@ -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

2
src/Rlp/Parse/Associate.hs
View File

@@ -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
--------------------------------------------------------------------------------

3
src/Rlp/Parse/Types.hs
View File

@@ -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
--------------------------------------------------------------------------------

3
src/Rlp/Syntax.hs
View File

@@ -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(..))
----------------------------------------------------------------------------------

2
src/Rlp2Core.hs
View File

@@ -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)

3
src/TI.hs
View File

@@ -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