Refactor

writeonly · May 15, 2024 · c52dbe4 · c52dbe4
1 parent 96a5839
commit c52dbe4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/catculator-core/src/main/scala/pl/writeonly/catculator/core/calculators/lazyk/ADT.scala b/catculator-core/src/main/scala/pl/writeonly/catculator/core/calculators/lazyk/ADT.scala
@@ -1,8 +1,7 @@
 package pl.writeonly.catculator.core.calculators.lazyk
 
-import pl.writeonly.catculator.core.adt.calculus.Combinator
 import pl.writeonly.catculator.core.adt.calculus.Combinator.CombinatorBT
-import pl.writeonly.catculator.core.adt.calculus.Constants
+import pl.writeonly.catculator.core.adt.calculus._
 import pl.writeonly.catculator.core.adt.tree.BinaryTree
 import pl.writeonly.catculator.core.adt.tree.BinaryTree._
 import spire.math.Natural
@@ -14,8 +13,10 @@ enum ADT:
 
 object ADT {
 
+  type Safe[A] = Either[String, A]
+
   type ADTBT = BinaryTree[ADT]
-  type ADTBTSafe = Either[String, ADTBT]
+  type ADTBTSafe = Safe[ADTBT]
 
   val number0: ADTBT = Leaf(ADT.Num(Natural.zero))
   val number1: ADTBT = Leaf(ADT.Num(Natural.one))

diff --git a/...ator-core/src/test/scala/pl/writeonly/catculator/core/calculators/lazyk/ReducerSpec.scala b/...ator-core/src/test/scala/pl/writeonly/catculator/core/calculators/lazyk/ReducerSpec.scala
@@ -1,10 +1,10 @@
 package pl.writeonly.catculator.core.calculators.lazyk
 
 import pl.writeonly.catculator.core.UnitSpec
-import pl.writeonly.catculator.core.adt.calculus.Combinator.*
-import pl.writeonly.catculator.core.adt.tree.BinaryTree.*
-import pl.writeonly.catculator.core.calculators.lazyk.ADT.*
-import pl.writeonly.catculator.core.calculators.lazyk.Reducer.*
+import pl.writeonly.catculator.core.adt.calculus.Combinator._
+import pl.writeonly.catculator.core.adt.tree.BinaryTree._
+import pl.writeonly.catculator.core.calculators.lazyk.ADT._
+import pl.writeonly.catculator.core.calculators.lazyk.Reducer._
 
 class ReducerSpec extends UnitSpec {
   "A Reducer" should {