Minor updates to be compatible with lens 4

diff --git a/dyna.cabal b/dyna.cabal
index 8a2e126e0bb016686ac13fb4ddcc8693f45ef85b..721ad530d6885db84a01463ee05df8780d867520 100644 (file)
--- a/dyna.cabal
+++ b/dyna.cabal
@@ -47,7 +47,7 @@ source-repository head
 --                         ghc-prim,
 --                         HUnit >=1.2,
 --                         mtl >=2.1,
---                         lens >=3.8,
+--                         lens >=4,
 --                         -- logict >=0.6,
 --                         parsers >=0.8.3,
 --                         recursion-schemes >=3.0,
@@ -77,7 +77,7 @@ source-repository head
 --                         either >= 3.4,
 --                         haskeline >=0.6,
 --                         mtl >=2.1,
---                         lens >=3.8,
+--                         lens >=4,
 --                         parsers >=0.8.3,
 --                         process >=1.1,
 --                         recursion-schemes >=3.0,
@@ -110,7 +110,7 @@ Executable dyna
                         ghc-prim,
                         HUnit >=1.2,
                         mtl >=2.1,
-                        lens >=3.8,
+                        lens >=4,
                         -- logict >=0.6,
                         parsers >=0.8.3,
                         process >=1.1,
@@ -145,7 +145,7 @@ Test-suite dyna-selftests
                         ghc-prim,
                         HUnit >=1.2,
                         mtl >=2.1,
-                        lens >=3.8,
+                        lens >=4,
                         -- logict >=0.6,
                         parsers >=0.8.3,
                         process >=1.1,

diff --git a/src/Dyna/Analysis/Mode/Inst.hs b/src/Dyna/Analysis/Mode/Inst.hs
index aad7ce467698edf0d3b184f13ad51ea791cd48b5..eb33a0eda1bfd3756c5575a56b512598d0f7301b 100644 (file)
--- a/src/Dyna/Analysis/Mode/Inst.hs
+++ b/src/Dyna/Analysis/Mode/Inst.hs
@@ -165,7 +165,7 @@ inst_recps = inst_rec . each . each
 -- disjunct and the argument position being traversed right now.
 inst_irecps :: (Applicative a) => ((f, Int) -> i -> a i')
                                -> InstF f i -> a (InstF f i')
-inst_irecps = itraverseOf (inst_rec .> each <.> each)
+inst_irecps = itraverseOf (inst_rec .> itraversed <.> itraversed)
 {-# INLINABLE inst_irecps #-}
 
 ------------------------------------------------------------------------}}}

diff --git a/src/Dyna/XXX/MonadUtils.hs b/src/Dyna/XXX/MonadUtils.hs
index 4cfdb8b407feebb6059003ad92338b3c5989dacf..cbb16e3f7f193bb0f34a99581da8a9f274563e6b 100644 (file)
--- a/src/Dyna/XXX/MonadUtils.hs
+++ b/src/Dyna/XXX/MonadUtils.hs
@@ -84,7 +84,7 @@ bracketState bs m = do
 -- pass "id" or something similarly simple (frequently much shorter than
 -- the type given here!)
 incState :: (Enum a, MonadState s m)
-         => Overloading (->) (->) ((,) a) s s a a
+         => Optical (->) (->) ((,) a) s s a a
          -> m a
 incState = (<<%= succ)
 {-# INLINABLE incState #-}