refactor: rename operator traits for consistency

Author: bobzhang

builtin/builtin.mbti

@@ -655,6 +655,22 @@ impl Logger {
 // Type aliases
 
 // Traits
+pub(open) trait Add {
+  op_add(Self, Self) -> Self
+}
+
+pub(open) trait BitAnd {
+  land(Self, Self) -> Self
+}
+
+pub(open) trait BitOr {
+  lor(Self, Self) -> Self
+}
+
+pub(open) trait BitXOr {
+  lxor(Self, Self) -> Self
+}
+
 pub(open) trait Compare : Eq {
   compare(Self, Self) -> Int
 }
@@ -697,6 +713,10 @@ impl Default for UInt64
 impl Default for Double
 impl[X] Default for FixedArray[X]
 
+pub(open) trait Div {
+  op_div(Self, Self) -> Self
+}
+
 pub(open) trait Eq {
   op_equal(Self, Self) -> Bool
 }
@@ -757,50 +777,22 @@ pub(open) trait Logger {
 }
 impl Logger::write_sub_string
 
-pub(open) trait OperatorAdd {
-  op_add(Self, Self) -> Self
-}
-
-pub(open) trait OperatorBitAnd {
-  land(Self, Self) -> Self
-}
-
-pub(open) trait OperatorBitOr {
-  lor(Self, Self) -> Self
-}
-
-pub(open) trait OperatorBitXOr {
-  lxor(Self, Self) -> Self
-}
-
-pub(open) trait OperatorDiv {
-  op_div(Self, Self) -> Self
-}
-
-pub(open) trait OperatorMod {
+pub(open) trait Mod {
   op_mod(Self, Self) -> Self
 }
 
-pub(open) trait OperatorMul {
+pub(open) trait Mul {
   op_mul(Self, Self) -> Self
 }
 
-pub(open) trait OperatorNeg {
+pub(open) trait Neg {
   op_neg(Self) -> Self
 }
 
-pub(open) trait OperatorShl {
+pub(open) trait Shl {
   op_shl(Self, Int) -> Self
 }
 
-pub(open) trait OperatorShr {
-  op_shr(Self, Int) -> Self
-}
-
-pub(open) trait OperatorSub {
-  op_sub(Self, Self) -> Self
-}
-
 pub(open) trait Show {
   output(Self, &Logger) -> Unit
   to_string(Self) -> String
@@ -838,6 +830,14 @@ impl[T0 : Show, T1 : Show, T2 : Show, T3 : Show, T4 : Show, T5 : Show, T6 : Show
 impl[T0 : Show, T1 : Show, T2 : Show, T3 : Show, T4 : Show, T5 : Show, T6 : Show, T7 : Show, T8 : Show, T9 : Show, T10 : Show, T11 : Show, T12 : Show, T13 : Show, T14 : Show] Show for (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14)
 impl[T0 : Show, T1 : Show, T2 : Show, T3 : Show, T4 : Show, T5 : Show, T6 : Show, T7 : Show, T8 : Show, T9 : Show, T10 : Show, T11 : Show, T12 : Show, T13 : Show, T14 : Show, T15 : Show] Show for (T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15)
 
+pub(open) trait Shr {
+  op_shr(Self, Int) -> Self
+}
+
+pub(open) trait Sub {
+  op_sub(Self, Self) -> Self
+}
+
 pub(open) trait ToJson {
   to_json(Self) -> Json
 }

builtin/operators.mbt

@@ -14,66 +14,66 @@
 
 ///|
 /// types implementing this trait can use the `+` operator
-pub(open) trait OperatorAdd {
+pub(open) trait Add {
   op_add(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `-` operator
-pub(open) trait OperatorSub {
+pub(open) trait Sub {
   op_sub(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `*` operator
-pub(open) trait OperatorMul {
+pub(open) trait Mul {
   op_mul(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `/` operator
-pub(open) trait OperatorDiv {
+pub(open) trait Div {
   op_div(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the unary `-` operator
-pub(open) trait OperatorNeg {
+pub(open) trait Neg {
   op_neg(Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `%` operator
-pub(open) trait OperatorMod {
+pub(open) trait Mod {
   op_mod(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `&` operator
-pub(open) trait OperatorBitAnd {
+pub(open) trait BitAnd {
   land(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `|` operator
-pub(open) trait OperatorBitOr {
+pub(open) trait BitOr {
   lor(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `^` operator
-pub(open) trait OperatorBitXOr {
+pub(open) trait BitXOr {
   lxor(Self, Self) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `<<` operator
-pub(open) trait OperatorShl {
+pub(open) trait Shl {
   op_shl(Self, Int) -> Self
 }
 
 ///|
 /// types implementing this trait can use the `>>` operator
-pub(open) trait OperatorShr {
+pub(open) trait Shr {
   op_shr(Self, Int) -> Self
 }