Move all singleton ops to scala.compiletime.ops package

As suggested in code review

Author: MaximeKjaer

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -233,8 +233,7 @@ class Definitions {
     @tu lazy val CompiletimeTesting_ErrorKind: Symbol = ctx.requiredModule("scala.compiletime.testing.ErrorKind")
       @tu lazy val CompiletimeTesting_ErrorKind_Parser: Symbol = CompiletimeTesting_ErrorKind.requiredMethod("Parser")
       @tu lazy val CompiletimeTesting_ErrorKind_Typer: Symbol = CompiletimeTesting_ErrorKind.requiredMethod("Typer")
-  @tu lazy val CompiletimeIntPackageObject: Symbol = ctx.requiredModule("scala.compiletime.int.package")
-  @tu lazy val CompiletimeBooleanPackageObject: Symbol = ctx.requiredModule("scala.compiletime.boolean.package")
+  @tu lazy val CompiletimeOpsPackageObject: Symbol = ctx.requiredModule("scala.compiletime.ops.package")
 
   /** The `scalaShadowing` package is used to safely modify classes and
    *  objects in scala so that they can be used from dotty. They will
@@ -901,24 +900,16 @@ class Definitions {
     sym.name == tpnme.S && sym.owner == CompiletimePackageObject.moduleClass
 
   final def isCompiletimeAppliedType(sym: Symbol)(implicit ctx: Context): Boolean = {
-    def isPackageObjectAppliedType: Boolean =
-      sym.owner == CompiletimePackageObject.moduleClass && Set(
-        tpnme.S, tpnme.Equals, tpnme.NotEquals
-      ).contains(sym.name)
-
-    def isIntAppliedType: Boolean =
-      sym.owner == CompiletimeIntPackageObject.moduleClass && Set(
+    def isOpsPackageObjectAppliedType: Boolean =
+      sym.owner == CompiletimeOpsPackageObject.moduleClass && Set(
+        tpnme.Equals, tpnme.NotEquals,
         tpnme.Plus, tpnme.Minus, tpnme.Times, tpnme.Div, tpnme.Mod,
         tpnme.Lt, tpnme.Gt, tpnme.Ge, tpnme.Le,
-        tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max
-      ).contains(sym.name)
-
-    def isBooleanAppliedType: Boolean =
-      sym.owner == CompiletimeBooleanPackageObject.moduleClass && Set(
+        tpnme.Abs, tpnme.Negate, tpnme.Min, tpnme.Max,
         tpnme.Not, tpnme.Xor, tpnme.And, tpnme.Or
       ).contains(sym.name)
 
-    sym.isType && (isPackageObjectAppliedType || isIntAppliedType || isBooleanAppliedType)
+    sym.isType && (isCompiletime_S(sym) || isOpsPackageObjectAppliedType)
   }
 
 

library/src/scala/compiletime/boolean/package.scala

@@ -1,6 +1,9 @@
 package scala.compiletime
 
-package object int {
+package object ops {
+  type ==[X <: AnyVal, Y <: AnyVal] <: Boolean
+  type !=[X <: AnyVal, Y <: AnyVal] <: Boolean
+
   type +[X <: Int, Y <: Int] <: Int
   type -[X <: Int, Y <: Int] <: Int
   type *[X <: Int, Y <: Int] <: Int
@@ -16,4 +19,9 @@ package object int {
   type Negate[X <: Int] <: Int
   type Min[X <: Int, Y <: Int] <: Int
   type Max[X <: Int, Y <: Int] <: Int
+
+  type ![X <: Boolean] <: Boolean
+  type ^[X <: Boolean, Y <: Boolean] <: Boolean
+  type &&[X <: Boolean, Y <: Boolean] <: Boolean
+  type ||[X <: Boolean, Y <: Boolean] <: Boolean
 }

library/src/scala/compiletime/int/package.scala renamed to library/src/scala/compiletime/ops/package.scala

@@ -63,7 +63,4 @@ package object compiletime {
    *      }
    */
   type S[N <: Int] <: Int
-
-  type ==[X <: AnyVal, Y <: AnyVal] <: Boolean
-  type !=[X <: AnyVal, Y <: AnyVal] <: Boolean
 }

library/src/scala/compiletime/package.scala

@@ -1,4 +1,4 @@
-import scala.compiletime.int._
+import scala.compiletime.ops._
 
 object Test {
   type Max2[A <: Int, B <: Int] <: Int = (A < B) match {

tests/neg/singleton-ops-match-type-scrutinee.scala

@@ -1,4 +1,4 @@
-import scala.compiletime.int._
+import scala.compiletime.ops._
 
 object Test {
   type GCD[A <: Int, B <: Int] <: Int = B match {

tests/neg/singleton-ops-recursive-match-type.scala

@@ -1,4 +1,4 @@
-import scala.compiletime.boolean._
+import scala.compiletime.ops._
 
 object Test {
   type Xor[A <: Boolean, B <: Boolean] = (A && ![B]) || (![A] && B)

tests/neg/singleton-ops-type-alias.scala

@@ -1,6 +1,4 @@
-import scala.compiletime._
-import scala.compiletime.int._
-import scala.compiletime.boolean._
+import scala.compiletime.ops._
 
 object Test {
   summon[2 + 3 =:= 6 - 1]

tests/neg/singleton-ops.scala

@@ -1,5 +1,4 @@
-import scala.compiletime.int._
-import scala.compiletime.boolean._
+import scala.compiletime.ops._
 
 object Test {
   val t0: 1 + 2 * 3 = 7