From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Mon, 10 Feb 2014 00:30:09 +0000 (-0500)
Subject: Minor updates to be compatible with lens 4
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=7dd255f56590ef35eb5be56d8650a6d0ba43f7f7;p=dyna2

Minor updates to be compatible with lens 4
---

diff --git a/dyna.cabal b/dyna.cabal
index 8a2e126..721ad53 100644
--- 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 aad7ce4..eb33a0e 100644
--- 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 4cfdb8b..cbb16e3 100644
--- 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 #-}