Refactor

catculator-core/src/main/scala/pl/writeonly/catculator/core/calculators/lazyk/Reducer.scala

@@ -1,10 +1,13 @@
 package pl.writeonly.catculator.core.calculators.lazyk
 
+import cats.Applicative
 import pl.writeonly.catculator.core.adt.calculus.Combinator
-import pl.writeonly.catculator.core.adt.calculus.Combinator._
+import pl.writeonly.catculator.core.adt.calculus.Combinator.*
+import pl.writeonly.catculator.core.adt.calculus.Lambda
 import pl.writeonly.catculator.core.adt.tree.BinaryTree
-import pl.writeonly.catculator.core.adt.tree.BinaryTree._
-import pl.writeonly.catculator.core.calculators.lazyk.ADT._
+import pl.writeonly.catculator.core.adt.tree.BinaryTree.*
+import pl.writeonly.catculator.core.calculators.lazyk.ADT.*
+import pl.writeonly.catculator.core.reducers.LambdaReducer.toCombinatorBT
 import spire.math.Natural
 
 import scala.util.Right
@@ -15,12 +18,7 @@ object Reducer {
     case x          => Right(x)
   }
 
-  def applyM(fM: ADTBTSafe, xM: ADTBTSafe): ADTBTSafe =
-    for
-      f <- fM
-      x <- xM
-      r <- apply(f, x)
-    yield r
+  def applyM(f: ADTBTSafe, x: ADTBTSafe): ADTBTSafe = Applicative[Safe[*]].map2(f, x)(apply).flatten
 
   def flippedApply(x: ADTBT, y: ADTBT): ADTBTSafe = apply(y, x)
 
@@ -36,5 +34,4 @@ object Reducer {
     case Leaf(ADT.Num(x)) => Right(Leaf(ADT.Num(x + Natural.one)))
     case _                => Left(s"attempted to apply inc to a non-number $x")
   }
-
 }