Hardcode SIP-33: term and type operators have the same priority

Author: Blaisorblade

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -471,13 +471,13 @@ object Parsers {
         syntaxError(MixedLeftAndRightAssociativeOps(op1, op2, op2LeftAssoc), offset)
 
     def reduceStack(base: List[OpInfo], top: Tree, prec: Int, leftAssoc: Boolean, op2: Name, isType: Boolean): Tree = {
-      if (opStack != base && precedence(opStack.head.operator.name, isType) == prec)
+      if (opStack != base && precedence(opStack.head.operator.name) == prec)
         checkAssoc(opStack.head.offset, opStack.head.operator.name, op2, leftAssoc)
       def recur(top: Tree): Tree = {
         if (opStack == base) top
         else {
           val opInfo = opStack.head
-          val opPrec = precedence(opInfo.operator.name, isType)
+          val opPrec = precedence(opInfo.operator.name)
           if (prec < opPrec || leftAssoc && prec == opPrec) {
             opStack = opStack.tail
             recur {
@@ -514,7 +514,7 @@ object Parsers {
       var top = first
       while (isIdent && isOperator) {
         val op = if (isType) typeIdent() else termIdent()
-        top = reduceStack(base, top, precedence(op.name, isType), isLeftAssoc(op.name), op.name, isType)
+        top = reduceStack(base, top, precedence(op.name), isLeftAssoc(op.name), op.name, isType)
         opStack = OpInfo(top, op, in.offset) :: opStack
         newLineOptWhenFollowing(canStartOperand)
         if (maybePostfix && !canStartOperand(in.token)) {

compiler/src/dotty/tools/dotc/parsing/package.scala

@@ -7,7 +7,7 @@ import core.NameOps._
 
 package object parsing {
 
-  def precedence(operator: Name, isType: Boolean = false): Int =
+  def precedence(operator: Name): Int =
     if (operator eq nme.ERROR) -1
     else {
       val firstCh = operator.firstPart.head

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -165,7 +165,7 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
 
     def toTextInfixType(opName: Name, l: Type, r: Type)(op: => Text): Text = {
       val isRightAssoc = opName.endsWith(":")
-      val opPrec = parsing.precedence(opName, true)
+      val opPrec = parsing.precedence(opName)
 
       changePrec(opPrec) {
         val leftPrec = if (isRightAssoc || checkAssocMismatch(l, isRightAssoc)) opPrec + 1 else opPrec

compiler/src/dotty/tools/dotc/printing/package.scala

@@ -9,8 +9,8 @@ package object printing {
   type Precedence = Int
 
   val DotPrec       = parsing.maxPrec
-  val AndTypePrec   = parsing.precedence(tpnme.raw.AMP, true)
-  val OrTypePrec    = parsing.precedence(tpnme.raw.BAR, true)
+  val AndTypePrec   = parsing.precedence(tpnme.raw.AMP)
+  val OrTypePrec    = parsing.precedence(tpnme.raw.BAR)
   val OrPrec        = parsing.precedence(nme.raw.BAR)
   val InfixPrec     = parsing.minInfixPrec
   val GlobalPrec    = parsing.minPrec