@@ -115,7 +115,7 @@ object SpaceEngine {
115
115
def decompose (typ : Typ )(using Context ): List [Typ ] = typ.decompose
116
116
117
117
/** Simplify space such that a space equal to `Empty` becomes `Empty` */
118
- def computeSimplify (space : Space )(using Context ): Space = trace(s " simplify( $space) " )(space match {
118
+ def computeSimplify (space : Space )(using Context ): Space = trace(i " simplify( $space) " )(space match {
119
119
case Prod (tp, fun, spaces) =>
120
120
val sps = spaces.mapconserve(simplify)
121
121
if sps.contains(Empty ) then Empty
@@ -166,7 +166,7 @@ object SpaceEngine {
166
166
}
167
167
168
168
/** Is `a` a subspace of `b`? Equivalent to `simplify(simplify(a) - simplify(b)) == Empty`, but faster */
169
- def computeIsSubspace (a : Space , b : Space )(using Context ): Boolean = trace(s " isSubspace( $a, $b) " ) {
169
+ def computeIsSubspace (a : Space , b : Space )(using Context ): Boolean = trace(i " isSubspace( $a, $b) " ) {
170
170
val a2 = simplify(a)
171
171
val b2 = simplify(b)
172
172
if (a ne a2) || (b ne b2) then isSubspace(a2, b2)
@@ -195,7 +195,7 @@ object SpaceEngine {
195
195
}
196
196
197
197
/** Intersection of two spaces */
198
- def intersect (a : Space , b : Space )(using Context ): Space = trace(s " $a & $b" ) {
198
+ def intersect (a : Space , b : Space )(using Context ): Space = trace(i " intersect( $a & $b) " ) {
199
199
(a, b) match {
200
200
case (Empty , _) | (_, Empty ) => Empty
201
201
case (_, Or (ss)) => Or (ss.map(intersect(a, _)).filter(_ ne Empty ))
@@ -220,7 +220,7 @@ object SpaceEngine {
220
220
}
221
221
222
222
/** The space of a not covered by b */
223
- def minus (a : Space , b : Space )(using Context ): Space = trace(s " $a - $b" ) {
223
+ def minus (a : Space , b : Space )(using Context ): Space = trace(i " minus( $a - $b) " ) {
224
224
(a, b) match {
225
225
case (Empty , _) => Empty
226
226
case (_, Empty ) => a
0 commit comments