removed IndexedShop (#52)

* removed IndexedShop

* fixed imports

* added test

* test uses clone now

Author: Roxxik

src/Data/Lens/Internal/IndexedShop.purs

@@ -14,7 +14,6 @@ module Data.Lens.Lens
 import Prelude
 
 import Data.Lens.Internal.Shop (Shop(..))
-import Data.Lens.Internal.IndexedShop (IndexedShop(..))
 import Data.Lens.Internal.Indexed (Indexed(..))
 import Data.Lens.Types
   ( Lens,  Lens', ALens, ALens'
@@ -50,7 +49,7 @@ ilens get set = ilens' \s -> Tuple (get s) \b -> set s b
 
 withIndexedLens :: forall i s t a b r.
   (AnIndexedLens i s t a b) -> ((s -> (Tuple i a)) -> (s -> b -> t) -> r) -> r
-withIndexedLens l f = case l (Indexed (IndexedShop id \_ b -> b)) of IndexedShop x y -> f x y
+withIndexedLens l f = case l (Indexed (Shop id \_ b -> b)) of Shop x y -> f x y
 
 cloneIndexedLens :: forall i s t a b. AnIndexedLens i s t a b -> IndexedLens i s t a b
 cloneIndexedLens l = withIndexedLens l \x y p -> ilens x y p

src/Data/Lens/Lens.purs

@@ -4,7 +4,6 @@ module Data.Lens.Types
   , module Data.Lens.Internal.Exchange
   , module Data.Lens.Internal.Market
   , module Data.Lens.Internal.Shop
-  , module Data.Lens.Internal.IndexedShop
   , module Data.Lens.Internal.Tagged
   , module Data.Lens.Internal.Forget
   , module Data.Lens.Internal.Wander
@@ -18,12 +17,12 @@ import Data.Lens.Internal.Indexed (Indexed(..))
 import Data.Lens.Internal.Market (Market(..))
 import Data.Lens.Internal.Re (Re(..))
 import Data.Lens.Internal.Shop (Shop(..))
-import Data.Lens.Internal.IndexedShop (IndexedShop(..))
 import Data.Lens.Internal.Tagged (Tagged(..))
 import Data.Lens.Internal.Wander (class Wander, wander)
 import Data.Profunctor (class Profunctor)
 import Data.Profunctor.Choice (class Choice)
 import Data.Profunctor.Strong (class Strong)
+import Data.Tuple
 
 -- | A general-purpose Data.Lens.
 type Optic p s t a b = p a b -> p s t
@@ -47,7 +46,7 @@ type ALens' s a = ALens s s a a
 type IndexedLens i s t a b = forall p. Strong p => IndexedOptic p i s t a b
 type IndexedLens' i s a = IndexedLens i s s a a
 
-type AnIndexedLens i s t a b = IndexedOptic (IndexedShop i a b) i s t a b
+type AnIndexedLens i s t a b = IndexedOptic (Shop (Tuple i a) b) i s t a b
 type AnIndexedLens' i s a = AnIndexedLens i s s a a
 
 -- | A prism.

src/Data/Lens/Types.purs

@@ -4,6 +4,8 @@ import Prelude
 
 import Data.Lens (view, traversed, _1, _2, _Just, _Left, lens)
 import Data.Lens.Index (ix)
+import Data.Lens.Setter (iover)
+import Data.Lens.Lens (ilens, IndexedLens, cloneIndexedLens)
 import Data.Lens.Fold ((^?))
 import Data.Lens.Zoom (Traversal, Traversal', Lens, Lens', zoom)
 import Data.Tuple  (Tuple(..))
@@ -53,8 +55,16 @@ stateTest :: Tuple Int String
 stateTest = evalState go (Tuple 4 ["Foo", "Bar"]) where
   go = Tuple <$> zoom _1 get <*> zoom (_2 <<< traversed) get
 
+--test cloning of indexed lenses
+cloneTest :: Tuple Int Int
+cloneTest = iover (cloneIndexedLens i_2) (+) (Tuple 1 2)
+
+i_2 :: forall i a b. IndexedLens i (Tuple i a) (Tuple i b) a b
+i_2 = ilens id \(Tuple i _) b -> Tuple i b
+
 main :: forall e. Eff (console :: CONSOLE | e) Unit
 main = do
   logShow $ view bars doc
   logShow $ doc2 ^? _1bars
   logShow stateTest
+  logShow cloneTest