Address review comments

Author: szeiger

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -45,9 +45,9 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
   final val shortenImports = false
 
   // All typechecked RHS of ValDefs for right-associative operator desugaring
-  val rightAssocValDefs = new mutable.AnyRefMap[Symbol, Tree]
+  private val rightAssocValDefs = new mutable.AnyRefMap[Symbol, Tree]
   // Symbols of ValDefs for right-associative operator desugaring which are passed by name and have been inlined
-  val inlinedRightAssocValDefs = new mutable.HashSet[Symbol]
+  private val inlinedRightAssocValDefs = new mutable.HashSet[Symbol]
 
   // allows override of the behavior of the resetTyper method w.r.t comments
   def resetDocComments() = {
@@ -2071,7 +2071,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
           transformedOrTyped(vdef.rhs, EXPRmode | BYVALmode, tpt2)
         }
       val vdef1 = treeCopy.ValDef(vdef, typedMods, sym.name, tpt1, checkDead(rhs1)) setType NoType
-      if (sym.isSynthetic && sym.name.toString.startsWith(nme.RIGHT_ASSOC_OP_PREFIX))
+      if (sym.isSynthetic && sym.name.startsWith(nme.RIGHT_ASSOC_OP_PREFIX))
         rightAssocValDefs += ((sym, vdef1.rhs))
       vdef1
     }
@@ -2486,7 +2486,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
 
         // Remove ValDef for right-associative by-value operator desugaring which has been inlined into expr1
         val statsTyped2 = statsTyped match {
-          case (vd: ValDef) :: Nil if inlinedRightAssocValDefs contains vd.symbol => Nil
+          case (vd: ValDef) :: Nil if inlinedRightAssocValDefs remove vd.symbol => Nil
           case _ => statsTyped
         }
 
@@ -3611,7 +3611,7 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
                 val args2 = (args1, mt.params) match {
                   case ((ident: Ident) :: Nil, param :: Nil) if param.isByNameParam && rightAssocValDefs.contains(ident.symbol) =>
                     inlinedRightAssocValDefs += ident.symbol
-                    val rhs = rightAssocValDefs(ident.symbol)
+                    val rhs = rightAssocValDefs.remove(ident.symbol).get
                     rhs.changeOwner(ident.symbol -> context.owner) :: Nil
                   case _ => args1
                 }

test/files/run/t1980.check

@@ -21,3 +21,9 @@ hi
 1
 1
 1
+5. defining
+Int 1
+Int 3
+5. forcing
+String 4
+String 2

test/files/run/t1980.scala

@@ -43,6 +43,7 @@ object Test extends App {
     println(x1())
   }
 
+  // Ensure the owner chain is changed correctly when inlining
   {
     println("4. defining")
     class C { def f_:(x: => Int): () => Int = (() => x) }
@@ -55,4 +56,20 @@ object Test extends App {
     println(x2())
     println(x3())
   }
+
+  // Overloaded operator with by-name and by-value variants
+  {
+    println("5. defining")
+    class C {
+      val saved = new collection.mutable.ArrayBuffer[() => String]
+      def force: Unit = saved.foreach(_.apply())
+      def :: (x: Int): C = this
+      def :: (x: => String): C = { saved += (() => x); this }
+    }
+    def genI(i: Int): Int = { println("Int "+i); i }
+    def genS(s: String): String = { println("String "+s); s }
+    val c = genI(1) :: genS("2") :: genI(3) :: genS("4") :: (new C)
+    println("5. forcing")
+    c.force
+  }
 }