Sitelet https://github.com/typelevel/cats/commit/591b73366bab889304e795d1c490830fce8f7a36
Skip to content

Commit 591b733

Browse files
armanbilgearmanbilge
committed
1 parent a652b61 commit 591b733

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎algebra-core/src/main/scala/algebra/lattice/Bool.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ trait Bool[@sp(Int, Long) A] extends Any with Heyting[A] with GenBool[A] { self
4343
* Note that the ring returned by this method is not an extension of
4444
* the `Rig` returned from `BoundedDistributiveLattice.asCommutativeRig`.
4545
*/
46-
override def asBoolRing: BoolRing[A] = new BoolRingFromBool(self)
46+
override private[algebra] def asBoolRing: BoolRing[A] = new BoolRingFromBool(self)
4747
}
4848

4949
class DualBool[@sp(Int, Long) A](orig: Bool[A]) extends Bool[A] {
@@ -62,7 +62,7 @@ class DualBool[@sp(Int, Long) A](orig: Bool[A]) extends Bool[A] {
6262
override def dual: Bool[A] = orig
6363
}
6464

65-
private[lattice] class BoolRingFromBool[A](orig: Bool[A]) extends BoolRngFromGenBool(orig) with BoolRing[A] {
65+
class BoolRingFromBool[A](orig: Bool[A]) extends BoolRngFromGenBool(orig) with BoolRing[A] {
6666
def one: A = orig.one
6767
}
6868

@@ -78,7 +78,7 @@ class BoolFromBoolRing[A](orig: BoolRing[A]) extends GenBoolFromBoolRng(orig) wi
7878
def one: A = orig.one
7979
def complement(a: A): A = orig.plus(orig.one, a)
8080
override def without(a: A, b: A): A = super[GenBoolFromBoolRng].without(a, b)
81-
override def asBoolRing: BoolRing[A] = orig
81+
override private[algebra] def asBoolRing: BoolRing[A] = orig
8282

8383
override def meet(a: A, b: A): A = super[GenBoolFromBoolRng].meet(a, b)
8484
override def join(a: A, b: A): A = super[GenBoolFromBoolRng].join(a, b)

‎algebra-core/src/main/scala/algebra/lattice/BoundedDistributiveLattice.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ trait BoundedDistributiveLattice[@sp(Int, Long, Float, Double) A]
1616
* Return a CommutativeRig using join and meet. Note this must obey the commutative rig laws since
1717
* meet(a, one) = a, and meet and join are associative, commutative and distributive.
1818
*/
19-
def asCommutativeRig: CommutativeRig[A] =
19+
private[algebra] def asCommutativeRig: CommutativeRig[A] =
2020
new CommutativeRig[A] {
2121
def zero: A = self.zero
2222
def one: A = self.one

‎algebra-core/src/main/scala/algebra/lattice/GenBool.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ trait GenBool[@sp(Int, Long) A] extends Any with DistributiveLattice[A] with Bou
3434
* Every generalized Boolean algebra is also a `BoolRng`, with
3535
* multiplication defined as `and` and addition defined as `xor`.
3636
*/
37-
def asBoolRing: BoolRng[A] = new BoolRngFromGenBool(self)
37+
private[algebra] def asBoolRing: BoolRng[A] = new BoolRngFromGenBool(self)
3838
}
3939

4040
/**
@@ -54,10 +54,10 @@ class GenBoolFromBoolRng[A](orig: BoolRng[A]) extends GenBool[A] {
5454
def and(a: A, b: A): A = orig.times(a, b)
5555
def or(a: A, b: A): A = orig.plus(orig.plus(a, b), orig.times(a, b))
5656
def without(a: A, b: A): A = orig.plus(a, orig.times(a, b))
57-
override def asBoolRing: BoolRng[A] = orig
57+
override private[algebra] def asBoolRing: BoolRng[A] = orig
5858
}
5959

60-
private[lattice] class BoolRngFromGenBool[@sp(Int, Long) A](orig: GenBool[A]) extends BoolRng[A] {
60+
class BoolRngFromGenBool[@sp(Int, Long) A](orig: GenBool[A]) extends BoolRng[A] {
6161
def zero: A = orig.zero
6262
def plus(x: A, y: A): A = orig.xor(x, y)
6363
def times(x: A, y: A): A = orig.and(x, y)

‎algebra-laws/shared/src/test/scala/algebra/laws/LawTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class LawTests extends munit.DisciplineSuite {
6060
checkAll("Boolean", RingLaws[Boolean].boolRing(booleanRing))
6161

6262
// ensure that Bool[A].asBoolRing is a valid BoolRing
63-
checkAll("Boolean-ring-from-bool", RingLaws[Boolean].boolRing(Bool[Boolean].asBoolRing))
63+
checkAll("Boolean-ring-from-bool", RingLaws[Boolean].boolRing(new BoolRingFromBool[Boolean](Bool[Boolean])))
6464

6565
// ensure that BoolRing[A].asBool is a valid Bool
6666
checkAll("Boolean- bool-from-ring", LogicLaws[Boolean].bool(new BoolFromBoolRing(booleanRing)))
@@ -91,7 +91,7 @@ class LawTests extends munit.DisciplineSuite {
9191
checkAll("Set[Byte]", LogicLaws[Set[Byte]].generalizedBool)
9292
checkAll("Set[Byte]", RingLaws[Set[Byte]].boolRng(setBoolRng[Byte]))
9393
checkAll("Set[Byte]-bool-from-rng", LogicLaws[Set[Byte]].generalizedBool(new GenBoolFromBoolRng(setBoolRng)))
94-
checkAll("Set[Byte]-rng-from-bool", RingLaws[Set[Byte]].boolRng(GenBool[Set[Byte]].asBoolRing))
94+
checkAll("Set[Byte]-rng-from-bool", RingLaws[Set[Byte]].boolRng(new BoolRngFromGenBool(GenBool[Set[Byte]])))
9595
checkAll("Set[Int]", OrderLaws[Set[Int]].partialOrder)
9696
checkAll("Set[Int]", RingLaws[Set[Int]].semiring)
9797
checkAll("Set[String]", RingLaws[Set[String]].semiring)

0 commit comments

Comments
 (0)