rename bitwise and/or compiletime int operations

Author: bishabosha

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

@@ -955,7 +955,7 @@ class Definitions {
     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, tpnme.ToString,
-    tpnme.Xor, tpnme.AND, tpnme.OR, tpnme.ASR, tpnme.LSL, tpnme.LSR
+    tpnme.Xor, tpnme.BitwiseAnd, tpnme.BitwiseOr, tpnme.ASR, tpnme.LSL, tpnme.LSR
   )
   private val compiletimePackageBooleanTypes: Set[Name] = Set(tpnme.Not, tpnme.Xor, tpnme.And, tpnme.Or)
   private val compiletimePackageStringTypes: Set[Name] = Set(tpnme.Plus)

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

@@ -208,27 +208,29 @@ object StdNames {
     final val IOOBException: N       = "IndexOutOfBoundsException"
     final val FunctionXXL: N         = "FunctionXXL"
 
-    final val Abs: N       = "Abs"
-    final val And: N       = "&&"
-    final val Div: N       = "/"
-    final val Equals: N    = "=="
-    final val Ge: N        = ">="
-    final val Gt: N        = ">"
-    final val Le: N        = "<="
-    final val Lt: N        = "<"
-    final val Max: N       = "Max"
-    final val Min: N       = "Min"
-    final val Minus: N     = "-"
-    final val Mod: N       = "%"
-    final val Negate: N    = "Negate"
-    final val Not: N       = "!"
-    final val NotEquals: N = "!="
-    final val Or: N        = "||"
-    final val Plus: N      = "+"
-    final val S: N         = "S"
-    final val Times: N     = "*"
-    final val ToString: N  = "ToString"
-    final val Xor: N       = "^"
+    final val Abs: N        = "Abs"
+    final val And: N        = "&&"
+    final val BitwiseAnd: N = "BitwiseAnd"
+    final val BitwiseOr: N  = "BitwiseOr"
+    final val Div: N        = "/"
+    final val Equals: N     = "=="
+    final val Ge: N         = ">="
+    final val Gt: N         = ">"
+    final val Le: N         = "<="
+    final val Lt: N         = "<"
+    final val Max: N        = "Max"
+    final val Min: N        = "Min"
+    final val Minus: N      = "-"
+    final val Mod: N        = "%"
+    final val Negate: N     = "Negate"
+    final val Not: N        = "!"
+    final val NotEquals: N  = "!="
+    final val Or: N         = "||"
+    final val Plus: N       = "+"
+    final val S: N          = "S"
+    final val Times: N      = "*"
+    final val ToString: N   = "ToString"
+    final val Xor: N        = "^"
 
     final val ClassfileAnnotation: N = "ClassfileAnnotation"
     final val ClassManifest: N       = "ClassManifest"

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

@@ -3843,8 +3843,8 @@ object Types {
               case tpnme.Ge  if nArgs == 2 => constantFold2(intValue, _ >= _)
               case tpnme.Le  if nArgs == 2 => constantFold2(intValue, _ <= _)
               case tpnme.Xor if nArgs == 2 => constantFold2(intValue, _ ^ _)
-              case tpnme.AND if nArgs == 2 => constantFold2(intValue, _ & _)
-              case tpnme.OR  if nArgs == 2 => constantFold2(intValue, _ | _)
+              case tpnme.BitwiseAnd if nArgs == 2 => constantFold2(intValue, _ & _)
+              case tpnme.BitwiseOr  if nArgs == 2 => constantFold2(intValue, _ | _)
               case tpnme.ASR if nArgs == 2 => constantFold2(intValue, _ >> _)
               case tpnme.LSL if nArgs == 2 => constantFold2(intValue, _ << _)
               case tpnme.LSR if nArgs == 2 => constantFold2(intValue, _ >>> _)

library/src/scala/compiletime/ops/package.scala

@@ -89,21 +89,6 @@ package object ops {
      */
     @infix type >>>[X <: Int, Y <: Int] <: Int
 
-    /** Bitwise and of `X` and `Y`.
-     *  ```scala
-     *  val and1: 4 & 4 = 4
-     *  val and2: 10 & 5 = 0
-     *  ```
-     */
-    @infix type &[X <: Int, Y <: Int] <: Int
-
-    /** Bitwise or of `X` and `Y`.
-     *  ```scala
-     *  val or: 10 | 11 = 11
-     *  ```
-     */
-    @infix type |[X <: Int, Y <: Int] <: Int
-
     /** Bitwise xor of `X` and `Y`.
      *  ```scala
      *  val xor: 10 ^ 30 = 20
@@ -143,6 +128,21 @@ package object ops {
      */
     @infix type <=[X <: Int, Y <: Int] <: Boolean
 
+    /** Bitwise and of `X` and `Y`.
+     *  ```scala
+     *  val and1: BitwiseAnd[4, 4] = 4
+     *  val and2: BitwiseAnd[10, 5] = 0
+     *  ```
+     */
+    type BitwiseAnd[X <: Int, Y <: Int] <: Int
+
+    /** Bitwise or of `X` and `Y`.
+     *  ```scala
+     *  val or: BitwiseOr[10, 11] = 11
+     *  ```
+     */
+    type BitwiseOr[X <: Int, Y <: Int] <: Int
+
     /** Absolute value of an `Int` singleton type.
      *  ```scala
      *  val abs: Abs[-1] = 1

tests/neg/singleton-ops-int.scala

@@ -78,15 +78,15 @@ object Test {
   val t54: -1 ^ -2 = 1
   val t55: -1 ^ -3 = 1 // error
 
-  val t56: 1 | 2 = 3
-  val t57: 10 | 12 = 13 // error
-  val t58: -11 | 12 = -3
-  val t59: -111 | -10 = 0 // error
-
-  val t60: 1 & 1 = 1
-  val t61: 1 & 2 = 0
-  val t62: -1 & -3 = 3 // error
-  val t63: -1 & -1 = 1 // error
+  val t56: BitwiseOr[1, 2] = 3
+  val t57: BitwiseOr[10, 12] = 13 // error
+  val t58: BitwiseOr[-11, 12] = -3
+  val t59: BitwiseOr[-111, -10] = 0 // error
+
+  val t60: BitwiseAnd[1, 1] = 1
+  val t61: BitwiseAnd[1, 2] = 0
+  val t62: BitwiseAnd[-1, -3] = 3 // error
+  val t63: BitwiseAnd[-1, -1] = 1 // error
 
   val t64: 1 << 1 = 2
   val t65: 1 << 2 = 4

tests/pos/singleton-ops-composition.scala

@@ -6,5 +6,5 @@ object Test {
   val t1: (2 * 7 + 1) % 10 = 5
   val t3: 1 * 1 + 2 * 2 + 3 * 3 + 4 * 4 = 30
   val t4: true && false || true && true || false ^ false = true
-  val t5: 100 << 2 >>> 2 >> 2 ^^ 3 | (7 & 7) = 31
+  val t5: BitwiseOr[100 << 2 >>> 2 >> 2 ^^ 3, BitwiseAnd[7, 7]] = 31
 }