Merge pull request #1 from ceedubs/writert-group-instances

Use instance hierarchy for WriterT group instances

core/src/main/scala/cats/data/WriterT.scala

@@ -76,10 +76,8 @@ private[data] sealed abstract class WriterTInstances extends WriterTInstances0 {
     override def show(f: WriterT[F, L, V]): String = f.show
   }
 
-  implicit def writerTMonoid[F[_], L, V](implicit W: Monoid[F[(L, V)]]): Monoid[WriterT[F, L, V]] = new Monoid[WriterT[F, L, V]] {
-    def empty = WriterT[F, L, V](W.empty)
-    def combine(x: WriterT[F, L, V], y: WriterT[F, L, V]): WriterT[F, L, V] = WriterT(W.combine(x.run, y.run))
-  }
+  implicit def writerTIdMonoid[L:Monoid, V:Monoid]: Monoid[WriterT[Id, L, V]] =
+    writerTMonoid[Id, L, V]
 }
 
 private[data] sealed abstract class WriterTInstances0 extends WriterTInstances1 {
@@ -97,6 +95,9 @@ private[data] sealed abstract class WriterTInstances0 extends WriterTInstances1
 
   implicit def writerTEq[F[_], L, V](implicit F: Eq[F[(L, V)]]): Eq[WriterT[F, L, V]] =
     F.on(_.run)
+
+  implicit def writerTIdSemigroup[L:Semigroup, V:Semigroup]: Semigroup[WriterT[Id, L, V]] =
+    writerTSemigroup[Id, L, V]
 }
 
 private[data] sealed abstract class WriterTInstances1 extends WriterTInstances2 {
@@ -105,13 +106,23 @@ private[data] sealed abstract class WriterTInstances1 extends WriterTInstances2
       implicit val F0: MonadFilter[F] = F
       implicit val L0: Monoid[L] = L
     }
+
+  implicit def writerTMonoid[F[_], L, V](implicit W: Monoid[F[(L, V)]]): Monoid[WriterT[F, L, V]] =
+    new WriterTMonoid[F, L, V] {
+      implicit val F0: Monoid[F[(L, V)]] = W
+    }
 }
 private[data] sealed abstract class WriterTInstances2 extends WriterTInstances3 {
   implicit def writerTMonadWriter[F[_], L](implicit F: Monad[F], L: Monoid[L]): MonadWriter[WriterT[F, L, ?], L] =
     new WriterTMonadWriter[F, L] {
       implicit val F0: Monad[F] = F
       implicit val L0: Monoid[L] = L
     }
+
+  implicit def writerTSemigroup[F[_], L, V](implicit W: Semigroup[F[(L, V)]]): Semigroup[WriterT[F, L, V]] =
+    new WriterTSemigroup[F, L, V] {
+      implicit val F0: Semigroup[F[(L, V)]] = W
+    }
 }
 
 private[data] sealed abstract class WriterTInstances3 extends WriterTInstances4 {
@@ -241,6 +252,19 @@ private[data] sealed trait WriterTMonadCombine[F[_], L] extends MonadCombine[Wri
   override implicit def F0: MonadCombine[F]
 }
 
+private[data] sealed trait WriterTSemigroup[F[_], L, A] extends Semigroup[WriterT[F, L, A]] {
+  implicit def F0: Semigroup[F[(L, A)]]
+
+  def combine(x: WriterT[F, L, A], y: WriterT[F, L, A]): WriterT[F, L, A] =
+    WriterT(F0.combine(x.run, y.run))
+}
+
+private[data] sealed trait WriterTMonoid[F[_], L, A] extends Monoid[WriterT[F, L, A]] with WriterTSemigroup[F, L, A]{
+  override implicit def F0: Monoid[F[(L, A)]]
+
+  def empty: WriterT[F, L, A] = WriterT(F0.empty)
+}
+
 trait WriterTFunctions {
   def putT[F[_], L, V](vf: F[V])(l: L)(implicit functorF: Functor[F]): WriterT[F, L, V] =
     WriterT(functorF.map(vf)(v => (l, v)))

tests/src/test/scala/cats/tests/WriterTTests.scala

@@ -248,11 +248,24 @@ class WriterTTests extends CatsSuite {
   }
 
   {
-     //F[(L, V)] has a monoid
-    implicit val FLV: Monoid[ListWrapper[(ListWrapper[Int], ListWrapper[Int])]] = ListWrapper.monoid[(ListWrapper[Int], ListWrapper[Int])]
+     // F[(L, V)] has a monoid
+    implicit val FLV: Monoid[ListWrapper[(Int, Int)]] = ListWrapper.monoid[(Int, Int)]
 
-    Monoid[WriterT[ListWrapper, ListWrapper[Int], ListWrapper[Int]]]
-    Semigroup[WriterT[ListWrapper, ListWrapper[Int], ListWrapper[Int]]]
-    checkAll("WriterT[ListWrapper, ListWrapper[Int], ListWrapper[Int]]", kernel.laws.GroupLaws[WriterT[ListWrapper, ListWrapper[Int], ListWrapper[Int]]].monoid)
+    Monoid[WriterT[ListWrapper, Int, Int]]
+    Semigroup[WriterT[ListWrapper, Int, Int]]
+    checkAll("WriterT[ListWrapper, Int, Int]", kernel.laws.GroupLaws[WriterT[ListWrapper, Int, Int]].monoid)
+
+    Monoid[WriterT[Id, Int, Int]]
+    Semigroup[WriterT[Id, Int, Int]]
+  }
+
+  {
+    // F[(L, V)] has a semigroup
+    implicit val FLV: Semigroup[ListWrapper[(Int, Int)]] = ListWrapper.semigroup[(Int, Int)]
+
+    Semigroup[WriterT[ListWrapper, Int, Int]]
+    checkAll("WriterT[ListWrapper, Int, Int]", kernel.laws.GroupLaws[WriterT[ListWrapper, Int, Int]].semigroup)
+
+    Semigroup[WriterT[Id, Int, Int]]
   }
 }